summaryrefslogtreecommitdiff
path: root/xmake/scripts/virtualenvs
diff options
context:
space:
mode:
authorHoildkv <[email protected]>2024-07-03 15:30:25 +0800
committerGitHub <[email protected]>2024-07-03 15:30:25 +0800
commit554af53869491ffe6f207d1201465810a08a00ba (patch)
tree9dea62abe5e9213e64b0d2908e1f19bd1590fb75 /xmake/scripts/virtualenvs
parentdbd3925e287ee6355b2999fc6f8c69ef95ac80ef (diff)
fix xrepo invalid prompt on linux
Diffstat (limited to 'xmake/scripts/virtualenvs')
-rw-r--r--xmake/scripts/virtualenvs/register-virtualenvs.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/xmake/scripts/virtualenvs/register-virtualenvs.sh b/xmake/scripts/virtualenvs/register-virtualenvs.sh
index a2263f67a..c852b93bf 100644
--- a/xmake/scripts/virtualenvs/register-virtualenvs.sh
+++ b/xmake/scripts/virtualenvs/register-virtualenvs.sh
@@ -71,14 +71,14 @@ function xrepo {
unset XMAKE_ENV_BACKUP
fi
pushd ${XMAKE_ROOTDIR} 1>/dev/null
- "$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info config $bnd || (popd 1>/dev/null && return 1)
- local prompt="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info prompt $bnd)" || (popd 1>/dev/null && return 1)
+ "$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info config $bnd || popd 1>/dev/null && return 1
+ local prompt="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info prompt $bnd)" || popd 1>/dev/null && return 1
if [ -z "${prompt+x}" ]; then
popd 1>/dev/null
echo "error: invalid environment!"
return 1
fi
- local activateCommand="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info script.bash $bnd)" || (popd 1>/dev/null && return 1)
+ local activateCommand="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info script.bash $bnd)" || popd 1>/dev/null && return 1
export XMAKE_ENV_BACKUP="$("$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info envfile $bnd)"
export XMAKE_PROMPT_BACKUP="${PS1}"
"$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info backup.bash $bnd 1>"$XMAKE_ENV_BACKUP"