diff options
| author | ruki <[email protected]> | 2024-03-19 23:27:01 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-03-19 14:52:03 +0800 |
| commit | 2d8b2fe62d4dfac8cc4e8f098f98268aa2ca7b57 (patch) | |
| tree | 2e60e232cd468810caa8c75519d65e0a20bfad8e /xmake/scripts/virtualenvs | |
| parent | 1eb61cd2e7723cb0614c2723379f3a7e3023dea5 (diff) | |
improve xrepo script
Diffstat (limited to 'xmake/scripts/virtualenvs')
| -rw-r--r-- | xmake/scripts/virtualenvs/register-virtualenvs.sh | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/xmake/scripts/virtualenvs/register-virtualenvs.sh b/xmake/scripts/virtualenvs/register-virtualenvs.sh index ac82e9b94..a2263f67a 100644 --- a/xmake/scripts/virtualenvs/register-virtualenvs.sh +++ b/xmake/scripts/virtualenvs/register-virtualenvs.sh @@ -19,10 +19,10 @@ # if test "${XMAKE_ROOTDIR}"; then - export XMAKE_EXE=${XMAKE_ROOTDIR}/xmake + export XMAKE_PROGRAM_FILE=${XMAKE_ROOTDIR}/xmake else local -i XMAKE_ROOTDIR=~/.local/bin - export XMAKE_EXE=xmake + export XMAKE_PROGRAM_FILE=xmake fi function xrepo { @@ -36,20 +36,20 @@ function xrepo { unset XMAKE_PROMPT_BACKUP unset XMAKE_ENV_BACKUP fi - "$XMAKE_EXE" lua private.xrepo.action.env.info config || return 1 - local currentTest="$("$XMAKE_EXE" lua --quiet private.xrepo.action.env)" || return 1 + "$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info config || return 1 + local currentTest="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env)" || return 1 if [ ! -z "$currentTest" ]; then echo "error: corrupt xmake.lua detected in the current directory!" return 1 fi - local prompt="$("$XMAKE_EXE" lua --quiet private.xrepo.action.env.info prompt)" || return 1 + local prompt="$("$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info prompt)" || return 1 if [ -z "${prompt+x}" ]; then return 1 fi - local activateCommand="$("$XMAKE_EXE" lua private.xrepo.action.env.info script.bash)" || return 1 - export XMAKE_ENV_BACKUP="$("$XMAKE_EXE" lua private.xrepo.action.env.info envfile)" + local activateCommand="$("$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info script.bash)" || return 1 + export XMAKE_ENV_BACKUP="$("$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info envfile)" export XMAKE_PROMPT_BACKUP="${PS1}" - "$XMAKE_EXE" lua private.xrepo.action.env.info backup.bash 1>"$XMAKE_ENV_BACKUP" + "$XMAKE_PROGRAM_FILE" lua private.xrepo.action.env.info backup.bash 1>"$XMAKE_ENV_BACKUP" eval "$activateCommand" PS1="${prompt} $PS1" ;; @@ -71,29 +71,29 @@ function xrepo { unset XMAKE_ENV_BACKUP fi pushd ${XMAKE_ROOTDIR} 1>/dev/null - "$XMAKE_EXE" lua private.xrepo.action.env.info config $bnd || (popd 1>/dev/null && return 1) - local prompt="$("$XMAKE_EXE" 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_EXE" lua --quiet private.xrepo.action.env.info script.bash $bnd)" || (popd 1>/dev/null && return 1) - export XMAKE_ENV_BACKUP="$("$XMAKE_EXE" lua private.xrepo.action.env.info envfile $bnd)" + 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_EXE" lua --quiet private.xrepo.action.env.info backup.bash $bnd 1>"$XMAKE_ENV_BACKUP" + "$XMAKE_PROGRAM_FILE" lua --quiet private.xrepo.action.env.info backup.bash $bnd 1>"$XMAKE_ENV_BACKUP" eval "$activateCommand" popd 1>/dev/null PS1="${prompt} $PS1" else - "$XMAKE_EXE" lua private.xrepo "$@" + "$XMAKE_PROGRAM_FILE" lua private.xrepo "$@" fi ;; *) - "$XMAKE_EXE" lua private.xrepo "$@" + "$XMAKE_PROGRAM_FILE" lua private.xrepo "$@" ;; esac else - "$XMAKE_EXE" lua private.xrepo "$@" + "$XMAKE_PROGRAM_FILE" lua private.xrepo "$@" fi } |