summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-05-08 21:32:25 +0800
committerruki <[email protected]>2021-05-08 21:32:25 +0800
commitf21aa19d54be924764fc92f2dfda52af6198899c (patch)
treec2296ad891ea87d4a2e6ca1f67ef2ee0f75783af
parent6a803af51efe12c76a48da851dbdf69242c4eebe (diff)
fix psm1 script path
-rw-r--r--scripts/installer.nsi3
-rw-r--r--xmake/actions/update/main.lua2
-rw-r--r--xmake/scripts/xrepo-hook.psm1 (renamed from scripts/xrepo-hook.psm1)0
3 files changed, 1 insertions, 4 deletions
diff --git a/scripts/installer.nsi b/scripts/installer.nsi
index bd47e463b..a01b6feea 100644
--- a/scripts/installer.nsi
+++ b/scripts/installer.nsi
@@ -238,10 +238,7 @@ Section "XMake (required)" InstallExeutable
File "..\core\build\xmake.exe"
File "..\scripts\xrepo.bat"
File "..\scripts\xrepo.ps1"
- File "..\scripts\xrepo-hook.psm1"
File /r /x ".DS_Store" "..\winenv"
- CreateDirectory "$InstDir\scripts"
- Rename "$InstDir\xrepo-hook.psm1" "$InstDir\scripts\xrepo-hook.psm1"
WriteUninstaller "uninstall.exe"
diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua
index 9ed4f412a..7264d472c 100644
--- a/xmake/actions/update/main.lua
+++ b/xmake/actions/update/main.lua
@@ -223,7 +223,7 @@ function _install_script(sourcedir)
local script_original = path.join(os.programdir(), "scripts", "update-script.bat")
local script = os.tmpfile() .. ".bat"
os.cp(script_original, script)
- local params = { "/c", script, os.programdir(), source }
+ local params = { "/c", script, os.programdir(), source }
os.tryrm(script_original .. ".bak")
local access = os.trymv(script_original, script_original .. ".bak")
_run_win_v("cmd", params, not access)
diff --git a/scripts/xrepo-hook.psm1 b/xmake/scripts/xrepo-hook.psm1
index 902ef3b16..902ef3b16 100644
--- a/scripts/xrepo-hook.psm1
+++ b/xmake/scripts/xrepo-hook.psm1