improve to install xrepo

8 files changed, 9 insertions, 10 deletions

diff --git a/.github/workflows/debian_mips.yml b/.github/workflows/debian_mips.yml
index 236de6f33..6ae4e84c9 100644
--- a/.github/workflows/debian_mips.yml
+++ b/.github/workflows/debian_mips.yml
@@ -28,4 +28,4 @@ jobs:
             source ~/.xmake/profile &&
             export XMAKE_ROOT=y &&
             export XMAKE_TMPDIR=/tmp &&
-            xmake lua -v -D tests/run.lua"
+            xmake lua -v -D tests/run.lua && xrepo --version"
diff --git a/.github/workflows/fedora.yml b/.github/workflows/fedora.yml
index 64df01833..b91083aae 100644
--- a/.github/workflows/fedora.yml
+++ b/.github/workflows/fedora.yml
@@ -82,4 +82,5 @@ jobs:
           XMAKE_ROOT: y
         run: |
           xmake lua -v -D tests/run.lua
+          xrepo --version
 
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index bd357fab7..626f93db2 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -30,6 +30,7 @@ jobs:
       - name: tests
         run: |
           xmake lua -v -D tests/run.lua
+          xrepo --version
 
         # build artifacts
       - name: artifact
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 3d4b410f4..0098eed98 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -30,6 +30,7 @@ jobs:
       - name: tests
         run: |
           xmake lua -v -D tests/run.lua
+          xrepo --version
 
         # build artifacts
       - name: artifact
diff --git a/.github/workflows/msys2_mingw.yml b/.github/workflows/msys2_mingw.yml
index 135fcd2bd..0f41834aa 100644
--- a/.github/workflows/msys2_mingw.yml
+++ b/.github/workflows/msys2_mingw.yml
@@ -44,3 +44,4 @@ jobs:
         run: |
           cd /C/_
           xmake lua -v -D tests/run.lua
+          xrepo --version
diff --git a/.github/workflows/ubuntu_arm.yml b/.github/workflows/ubuntu_arm.yml
index b6385e50e..a8f0afa5c 100644
--- a/.github/workflows/ubuntu_arm.yml
+++ b/.github/workflows/ubuntu_arm.yml
@@ -28,7 +28,7 @@ jobs:
             source ~/.xmake/profile &&
             export XMAKE_ROOT=y &&
             export XMAKE_TMPDIR=/tmp &&
-            xmake lua -v -D tests/run.lua"
+            xmake lua -v -D tests/run.lua && xrepo --version"
 
       - uses: docker://multiarch/ubuntu-core:armhf-bionic
         with:
@@ -41,5 +41,5 @@ jobs:
             source ~/.xmake/profile &&
             export XMAKE_ROOT=y &&
             export XMAKE_TMPDIR=/tmp &&
-            xmake lua -v -D tests/run.lua"
+            xmake lua -v -D tests/run.lua && xrepo --version"
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9fbc35ce2..04aca62cd 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -59,6 +59,7 @@ jobs:
           xmake show
           #xmake l -v private.utils.bcsave --rootname='@programdir' -x 'scripts/**|templates/**' xmake
           xmake lua -v -D tests/run.lua
+          xrepo --version
 
         # build artifacts
       - name: set release arch name
diff --git a/makefile b/makefile
index 670be66b3..32b8f74cf 100644
--- a/makefile
+++ b/makefile
@@ -85,13 +85,7 @@ xmake_core_install  :=$(destdir)/bin/xmake.exe
 else
 xmake_core_install  :=$(destdir)/bin/xmake
 endif
-ifdef iswin
-xrepo_name 			:=xrepo.bat
-xrepo_bin_install   :=$(destdir)/bin/xrepo.bat
-else
-xrepo_name 			:=xrepo.sh
 xrepo_bin_install   :=$(destdir)/bin/xrepo
-endif
 
 build:
 	@echo compiling xmake-core ...
@@ -115,7 +109,7 @@ install:
 	@cp $(xmake_core) $(xmake_core_install)
 	@chmod 777 $(xmake_core_install)
 	@# install the xrepo bin file
-	@cp ./scripts/$(xrepo_name) $(xrepo_bin_install)
+	@echo "#!/usr/bin/env sh\n$(xmake_core_install) lua private.xrepo \""'$$@"' > $(xrepo_bin_install)
 	@chmod 777 $(xrepo_bin_install)
 	@# remove xmake.out
 	@if [ -f "$(TMP_DIR)/xmake.out" ]; then rm $(TMP_DIR)/xmake.out; fi