Skip to content

Commit 0bf2063

Browse files
authored
Merge pull request #5300 from xq114/dev
fix xrepo invalid prompt on linux
2 parents 07f422a + 554af53 commit 0bf2063

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Diff for: xmake/scripts/virtualenvs/register-virtualenvs.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ function xrepo {
7171
unset XMAKE_ENV_BACKUP
7272
fi
7373
pushd ${XMAKE_ROOTDIR} 1>/dev/null
74-
"$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info config $bnd || (popd 1>/dev/null && return 1)
75-
local prompt="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info prompt $bnd)" || (popd 1>/dev/null && return 1)
74+
"$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info config $bnd || popd 1>/dev/null && return 1
75+
local prompt="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info prompt $bnd)" || popd 1>/dev/null && return 1
7676
if [ -z "${prompt+x}" ]; then
7777
popd 1>/dev/null
7878
echo "error: invalid environment!"
7979
return 1
8080
fi
81-
local activateCommand="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info script.bash $bnd)" || (popd 1>/dev/null && return 1)
81+
local activateCommand="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info script.bash $bnd)" || popd 1>/dev/null && return 1
8282
export XMAKE_ENV_BACKUP="$("$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info envfile $bnd)"
8383
export XMAKE_PROMPT_BACKUP="${PS1}"
8484
"$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info backup.bash $bnd 1>"$XMAKE_ENV_BACKUP"

0 commit comments

Comments
 (0)