Merge pull request pyenv#1786 from scop/nounset

Make work in nounset (-u) mode
calshankar · Feb 28, 2021 · ec2d2b9 · ec2d2b9
2 parents 338c366 + f06fb60
commit ec2d2b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/libexec/pyenv-sh-shell b/libexec/pyenv-sh-shell
@@ -49,7 +49,7 @@ if [ "$versions" = "--unset" ]; then
     echo "set -e PYENV_VERSION"
     ;;
   * )
-    echo 'PYENV_VERSION_OLD="$PYENV_VERSION"'
+    echo 'PYENV_VERSION_OLD="${PYENV_VERSION-}"'
     echo "unset PYENV_VERSION"
     ;;
   esac
@@ -110,7 +110,7 @@ if pyenv-prefix "${versions[@]}" >/dev/null; then
       echo "set -gx PYENV_VERSION \"$version\""
       ;;
     * )
-      echo 'PYENV_VERSION_OLD="$PYENV_VERSION"'
+      echo 'PYENV_VERSION_OLD="${PYENV_VERSION-}"'
       echo "export PYENV_VERSION=\"${version}\""
       ;;
     esac

diff --git a/test/shell.bats b/test/shell.bats
@@ -47,7 +47,7 @@ load test_helper
   PYENV_SHELL=bash run pyenv-sh-shell --unset
   assert_success
   assert_output <<OUT
-PYENV_VERSION_OLD="\$PYENV_VERSION"
+PYENV_VERSION_OLD="\${PYENV_VERSION-}"
 unset PYENV_VERSION
 OUT
 }
@@ -75,7 +75,7 @@ SH
   PYENV_SHELL=bash run pyenv-sh-shell 1.2.3
   assert_success
   assert_output <<OUT
-PYENV_VERSION_OLD="\$PYENV_VERSION"
+PYENV_VERSION_OLD="\${PYENV_VERSION-}"
 export PYENV_VERSION="1.2.3"
 OUT
 }