diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml
index 02cef9b6..a5efa279 100644
--- a/.github/workflows/release-drafter.yml
+++ b/.github/workflows/release-drafter.yml
@@ -47,7 +47,8 @@ jobs:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - uses: release-drafter/release-drafter@v6
         # (Optional) specify config name to use, relative to .github/. Default: release-drafter.yml
-        # with:
+        with:
+          commitish: master
         #   config-name: my-config.yml
         #   disable-autolabeler: true
         env:
diff --git a/libexec/goenv-commands b/libexec/goenv-commands
index 79e8141f..ca873693 100755
--- a/libexec/goenv-commands
+++ b/libexec/goenv-commands
@@ -37,17 +37,18 @@ shopt -s nullglob
 
   for path in "${paths[@]}"; do
     for command in "${path}/goenv-"*; do
-      command="${command##*goenv-}"
+      [ -x "$command" ] || continue
+      command="${command##*/goenv-}"
       if [ -n "$sh" ]; then
-        if [ ${command:0:3} = "sh-" ]; then
-          echo ${command##sh-}
+        if [ ${command:0:3} == "sh-" ]; then
+          echo "${command##sh-}"
         fi
       elif [ -n "$nosh" ]; then
         if [ ${command:0:3} != "sh-" ]; then
-          echo ${command##sh-}
+          echo "${command##sh-}"
         fi
       else
-        echo ${command##sh-}
+        echo "${command##sh-}"
       fi
     done
   done