summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorruki <[email protected]>2021-11-06 20:39:16 +0800
committerGitHub <[email protected]>2021-11-06 20:39:16 +0800
commit736dc4db6368fa4dd1770e768c5577bc8d55255d (patch)
tree7909ee3cf27c5bb190fd7f80c7e36dbb07d9ddbc /scripts
parent95dea5af25edb9f1eda15ad8412342e26ef39525 (diff)
parent6bbb5f94c3beadf5d5dfc6db59d05a686647a39b (diff)
Merge pull request #1808 from xq114/dev
improve env config
Diffstat (limited to 'scripts')
-rw-r--r--scripts/register-virtualenvs.sh1
-rwxr-xr-xscripts/xrepo.bat4
2 files changed, 5 insertions, 0 deletions
diff --git a/scripts/register-virtualenvs.sh b/scripts/register-virtualenvs.sh
index 8518060f8..cf067d040 100644
--- a/scripts/register-virtualenvs.sh
+++ b/scripts/register-virtualenvs.sh
@@ -47,6 +47,7 @@ function xrepo {
unset XMAKE_PROMPT_BACKUP
unset XMAKE_ENV_BACKUP
fi
+ "$XMAKE_EXE" lua private.xrepo.action.env.info config $bnd || return 1
local prompt="$("$XMAKE_EXE" lua --quiet private.xrepo.action.env.info prompt $bnd)" || return 1
if [ -z "${prompt+x}" ]; then
return 1
diff --git a/scripts/xrepo.bat b/scripts/xrepo.bat
index 82180398a..0416d4a10 100755
--- a/scripts/xrepo.bat
+++ b/scripts/xrepo.bat
@@ -81,6 +81,10 @@
exit /B 1
) else (
setlocal EnableDelayedExpansion
+ %XMAKE_EXE% lua private.xrepo.action.env.info config %3
+ if !errorlevel! neq 0 (
+ exit /B !errorlevel!
+ )
@%XMAKE_EXE% lua --quiet private.xrepo.action.env.info prompt %3 1>nul
if !errorlevel! neq 0 (
echo error: environment not found^^!