Only define x if available; Refs #857 (#858)

* Only define `x` if available; Refs #857 * Note that this doesn’t change the behavior of the command not found handler, that should be a separate more involved fix. * Add test
pkgxdev · Nov 17, 2023 · e441d0c · e441d0c
1 parent 87bb929
commit e441d0c
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 20 deletions.
diff --git a/.github/workflows/ci.shellcode.yml b/.github/workflows/ci.shellcode.yml
@@ -415,3 +415,24 @@ jobs:
             echo 'dev did not fail when already activated' >&2
             exit 1
           fi
+
+  x-already-defined-works:
+    needs: compile
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        shell: zsh -eo pipefail {0}
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          path: /usr/local/bin
+          name: pkgx
+      - name: prep
+        run: |
+          sudo apt-get update && sudo apt-get --yes install zsh libatomic1
+          chmod u+x /usr/local/bin/pkgx
+        shell: sh
+      - run: |
+          alias x="echo hi"
+          eval "$(pkgx --shellcode)"
+          test "$(x)" = hi
diff --git a/src/modes/shellcode.ts b/src/modes/shellcode.ts
@@ -44,24 +44,26 @@ export default function() {
       esac
     }
 
-    x() {
-      case $1 in
-      "")
-        if [ -f "${tmp}/shellcode/x.$$" ]; then
-          if foo="$("${tmp}/shellcode/u.$$")"; then
-            eval "$foo"
-            ${sh} "${tmp}/shellcode/x.$$"
-            unset foo
-          fi
-          rm "${tmp}/shellcode/"?.$$
-        else
-          echo "pkgx: nothing to run" >&2
-          return 1
-        fi;;
-      *)
-        command pkgx -- "$@";;
-      esac
-    }
+    if ! type x >/dev/null 2>&1; then
+      eval 'x() {
+        case $1 in
+        "")
+          if [ -f "${tmp}/shellcode/x.$$" ]; then
+            if foo="$("${tmp}/shellcode/u.$$")"; then
+              eval "$foo"
+              ${sh} "${tmp}/shellcode/x.$$"
+              unset foo
+            fi
+            rm "${tmp}/shellcode/"?.$$
+          else
+            echo "pkgx: nothing to run" >&2
+            return 1
+          fi;;
+        *)
+          command pkgx -- "$@";;
+        esac
+      }'
+    fi
 
     env() {
       for arg in "$@"; do
@@ -78,8 +80,8 @@ export default function() {
       done
       if [ $# -eq 0 ]; then
         command env
-      fi
-      if type _pkgx_reset >/dev/null 2>&1; then
+        return
+      elif type _pkgx_reset >/dev/null 2>&1; then
         _pkgx_reset
       fi
       eval "$(command pkgx --internal.use "$@")"