From f06fb60b1fa0efbeb100b4da925ee09021d063a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 16 Jan 2021 14:38:31 +0200
Subject: [PATCH] Make work in nounset (-u) mode

---
 libexec/pyenv-sh-shell | 4 ++--
 test/shell.bats        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libexec/pyenv-sh-shell b/libexec/pyenv-sh-shell
index b38abbf3..51352e1d 100755
--- 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
index 0871065c..daa5744b 100644
--- 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
 }