wip

pkgxdev · Nov 17, 2023 · f24bd74 · f24bd74
1 parent 5e4795b
commit f24bd74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/ci.shellcode.yml b/.github/workflows/ci.shellcode.yml
@@ -432,7 +432,6 @@ jobs:
           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)"

diff --git a/src/modes/shellcode.ts b/src/modes/shellcode.ts
@@ -45,7 +45,7 @@ export default function() {
     }
 
     if ! type x >/dev/null 2>&1; then
-      x() {
+      eval 'x() {
         case $1 in
         "")
           if [ -f "${tmp}/shellcode/x.$$" ]; then
@@ -62,7 +62,7 @@ export default function() {
         *)
           command pkgx -- "$@";;
         esac
-      }
+      }'
     fi
 
     env() {
@@ -80,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 "$@")"