m/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2025-11-17 15:53:45 -05:00
Code Wiki Activity

Conforms OLD_RBENV_VERSION to RBENV_* convention

Browse Source 
Keeping rbenv-controlled variables to RBENV_* "namespace" helps with
discoverability (and tools like rbenv-env) but also consistency and a
very minor degree of safety/isolation from env impact.
This commit is contained in:
Jason Karns
2016-12-19 17:21:45 -05:00
parent e60ad4a090
commit 8eb97549e1
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
libexec/rbenv-sh-shell
View File

@@ -45,11 +45,11 @@ fi
if [ "$version" = "--unset" ]; then
case "$shell" in
fish )
echo 'set -gu OLD_RBENV_VERSION "$RBENV_VERSION"'
echo 'set -gu RBENV_VERSION_OLD "$RBENV_VERSION"'
echo "set -e RBENV_VERSION"
;;
* )
echo 'OLD_RBENV_VERSION="$RBENV_VERSION"'
echo 'RBENV_VERSION_OLD="$RBENV_VERSION"'
echo "unset RBENV_VERSION"
;;
esac
@@ -60,36 +60,36 @@ if [ "$version" = "-" ]; then
case "$shell" in
fish )
cat <<EOS
if set -q OLD_RBENV_VERSION
if [ -n "\$OLD_RBENV_VERSION" ]
set OLD_RBENV_VERSION_ "\$RBENV_VERSION"
set -gx RBENV_VERSION "\$OLD_RBENV_VERSION"
set -gu OLD_RBENV_VERSION "\$OLD_RBENV_VERSION_"
set -e OLD_RBENV_VERSION_
if set -q RBENV_VERSION_OLD
if [ -n "\$RBENV_VERSION_OLD" ]
set RBENV_VERSION_OLD_ "\$RBENV_VERSION"
set -gx RBENV_VERSION "\$RBENV_VERSION_OLD"
set -gu RBENV_VERSION_OLD "\$RBENV_VERSION_OLD_"
set -e RBENV_VERSION_OLD_
else
set -gu OLD_RBENV_VERSION "\$RBENV_VERSION"
set -gu RBENV_VERSION_OLD "\$RBENV_VERSION"
set -e RBENV_VERSION
end
else
echo "rbenv: OLD_RBENV_VERSION is not set" >&2
echo "rbenv: RBENV_VERSION_OLD is not set" >&2
false
end
EOS
;;
* )
cat <<EOS
if [ -n "\${OLD_RBENV_VERSION+x}" ]; then
if [ -n "\$OLD_RBENV_VERSION" ]; then
OLD_RBENV_VERSION_="\$RBENV_VERSION"
export RBENV_VERSION="\$OLD_RBENV_VERSION"
OLD_RBENV_VERSION="\$OLD_RBENV_VERSION_"
unset OLD_RBENV_VERSION_
if [ -n "\${RBENV_VERSION_OLD+x}" ]; then
if [ -n "\$RBENV_VERSION_OLD" ]; then
RBENV_VERSION_OLD_="\$RBENV_VERSION"
export RBENV_VERSION="\$RBENV_VERSION_OLD"
RBENV_VERSION_OLD="\$RBENV_VERSION_OLD_"
unset RBENV_VERSION_OLD_
else
OLD_RBENV_VERSION="\$RBENV_VERSION"
RBENV_VERSION_OLD="\$RBENV_VERSION"
unset RBENV_VERSION
fi
else
echo "rbenv: OLD_RBENV_VERSION is not set" >&2
echo "rbenv: RBENV_VERSION_OLD is not set" >&2
false
fi
EOS
@@ -103,11 +103,11 @@ if rbenv-prefix "$version" >/dev/null; then
if [ "$version" != "$RBENV_VERSION" ]; then
case "$shell" in
fish )
echo 'set -gu OLD_RBENV_VERSION "$RBENV_VERSION"'
echo 'set -gu RBENV_VERSION_OLD "$RBENV_VERSION"'
echo "set -gx RBENV_VERSION \"$version\""
;;
* )
echo 'OLD_RBENV_VERSION="$RBENV_VERSION"'
echo 'RBENV_VERSION_OLD="$RBENV_VERSION"'
echo "export RBENV_VERSION=\"$version\""
;;
esac