From 57e68c2304c528d1183850dcbd4c6d62c34c39ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Thu, 26 Dec 2024 12:22:22 +0100
Subject: [PATCH] goenv-init: Fix use of optional variables that should not
 crash the calling shell if unset

Just use the ${variable:-} syntax to accept unset variables
---
 libexec/goenv-init   |  6 +++---
 test/goenv-init.bats | 25 ++++++++++++-------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/libexec/goenv-init b/libexec/goenv-init
index 3e4d0912..df483402 100755
--- a/libexec/goenv-init
+++ b/libexec/goenv-init
@@ -108,14 +108,14 @@ EOL
   cat <<EOL
 export GOENV_SHELL=${shell}
 export GOENV_ROOT=${GOENV_ROOT}
-if [ -z "\${GOENV_RC_FILE}" ]; then
+if [ -z "\${GOENV_RC_FILE:-}" ]; then
   GOENV_RC_FILE="\${HOME}/.goenvrc"
 fi
-if [ -e "\${GOENV_RC_FILE}" ]; then
+if [ -e "\${GOENV_RC_FILE:-}" ]; then
   source "\${GOENV_RC_FILE}"
 fi
 if [ "\${PATH#*\$GOENV_ROOT/shims}" = "\${PATH}" ]; then
-  if [ "\${GOENV_PATH_ORDER}" = "front" ] ; then
+  if [ "\${GOENV_PATH_ORDER:-}" = "front" ] ; then
     export PATH="\${GOENV_ROOT}/shims:\${PATH}"
   else
     export PATH="\${PATH}:\${GOENV_ROOT}/shims"
diff --git a/test/goenv-init.bats b/test/goenv-init.bats
index 5b52d59f..118d585b 100644
--- a/test/goenv-init.bats
+++ b/test/goenv-init.bats
@@ -135,14 +135,14 @@ OUT
 
   assert_line 0  'export GOENV_SHELL=bash'
   assert_line 1  "export GOENV_ROOT=$GOENV_ROOT"
-  assert_line 2  'if [ -z "${GOENV_RC_FILE}" ]; then'
+  assert_line 2  'if [ -z "${GOENV_RC_FILE:-}" ]; then'
   assert_line 3  '  GOENV_RC_FILE="${HOME}/.goenvrc"'
   assert_line 4  'fi'
-  assert_line 5  'if [ -e "${GOENV_RC_FILE}" ]; then'
+  assert_line 5  'if [ -e "${GOENV_RC_FILE:-}" ]; then'
   assert_line 6  '  source "${GOENV_RC_FILE}"'
   assert_line 7  'fi'
   assert_line 8  'if [ "${PATH#*$GOENV_ROOT/shims}" = "${PATH}" ]; then'
-  assert_line 9  '  if [ "${GOENV_PATH_ORDER}" = "front" ] ; then'
+  assert_line 9  '  if [ "${GOENV_PATH_ORDER:-}" = "front" ] ; then'
   assert_line 10 '    export PATH="${GOENV_ROOT}/shims:${PATH}"'
   assert_line 11 '  else'
   assert_line 12 '    export PATH="${PATH}:${GOENV_ROOT}/shims"'
@@ -173,14 +173,14 @@ OUT
 
   assert_line 0  'export GOENV_SHELL=zsh'
   assert_line 1  "export GOENV_ROOT=$GOENV_ROOT"
-  assert_line 2  'if [ -z "${GOENV_RC_FILE}" ]; then'
+  assert_line 2  'if [ -z "${GOENV_RC_FILE:-}" ]; then'
   assert_line 3  '  GOENV_RC_FILE="${HOME}/.goenvrc"'
   assert_line 4  'fi'
-  assert_line 5  'if [ -e "${GOENV_RC_FILE}" ]; then'
+  assert_line 5  'if [ -e "${GOENV_RC_FILE:-}" ]; then'
   assert_line 6  '  source "${GOENV_RC_FILE}"'
   assert_line 7  'fi'
   assert_line 8  'if [ "${PATH#*$GOENV_ROOT/shims}" = "${PATH}" ]; then'
-  assert_line 9  '  if [ "${GOENV_PATH_ORDER}" = "front" ] ; then'
+  assert_line 9  '  if [ "${GOENV_PATH_ORDER:-}" = "front" ] ; then'
   assert_line 10 '    export PATH="${GOENV_ROOT}/shims:${PATH}"'
   assert_line 11 '  else'
   assert_line 12 '    export PATH="${PATH}:${GOENV_ROOT}/shims"'
@@ -244,14 +244,14 @@ OUT
 
   assert_line 0  'export GOENV_SHELL=ksh'
   assert_line 1  "export GOENV_ROOT=$GOENV_ROOT"
-  assert_line 2  'if [ -z "${GOENV_RC_FILE}" ]; then'
+  assert_line 2  'if [ -z "${GOENV_RC_FILE:-}" ]; then'
   assert_line 3  '  GOENV_RC_FILE="${HOME}/.goenvrc"'
   assert_line 4  'fi'
-  assert_line 5  'if [ -e "${GOENV_RC_FILE}" ]; then'
+  assert_line 5  'if [ -e "${GOENV_RC_FILE:-}" ]; then'
   assert_line 6  '  source "${GOENV_RC_FILE}"'
   assert_line 7  'fi'
   assert_line 8  'if [ "${PATH#*$GOENV_ROOT/shims}" = "${PATH}" ]; then'
-  assert_line 9  '  if [ "${GOENV_PATH_ORDER}" = "front" ] ; then'
+  assert_line 9  '  if [ "${GOENV_PATH_ORDER:-}" = "front" ] ; then'
   assert_line 10 '    export PATH="${GOENV_ROOT}/shims:${PATH}"'
   assert_line 11 '  else'
   assert_line 12 '    export PATH="${PATH}:${GOENV_ROOT}/shims"'
@@ -281,14 +281,14 @@ OUT
   # NOTE: This is very likely to be invalid for your specific shell
   assert_line 0  'export GOENV_SHELL=magicshell'
   assert_line 1  "export GOENV_ROOT=$GOENV_ROOT"
-  assert_line 2  'if [ -z "${GOENV_RC_FILE}" ]; then'
+  assert_line 2  'if [ -z "${GOENV_RC_FILE:-}" ]; then'
   assert_line 3  '  GOENV_RC_FILE="${HOME}/.goenvrc"'
   assert_line 4  'fi'
-  assert_line 5  'if [ -e "${GOENV_RC_FILE}" ]; then'
+  assert_line 5  'if [ -e "${GOENV_RC_FILE:-}" ]; then'
   assert_line 6  '  source "${GOENV_RC_FILE}"'
   assert_line 7  'fi'
   assert_line 8  'if [ "${PATH#*$GOENV_ROOT/shims}" = "${PATH}" ]; then'
-  assert_line 9  '  if [ "${GOENV_PATH_ORDER}" = "front" ] ; then'
+  assert_line 9  '  if [ "${GOENV_PATH_ORDER:-}" = "front" ] ; then'
   assert_line 10 '    export PATH="${GOENV_ROOT}/shims:${PATH}"'
   assert_line 11 '  else'
   assert_line 12 '    export PATH="${PATH}:${GOENV_ROOT}/shims"'
@@ -311,4 +311,3 @@ OUT
 
   assert_success
 }
-