avoid a couple fork/execs

tokuhirom · Nov 11, 2015 · 5da835c · 5da835c
1 parent d1e7699
commit 5da835c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/libexec/plenv-commands b/libexec/plenv-commands
@@ -40,4 +40,4 @@ shopt -s nullglob
       fi
     done
   done
-} | sort | uniq
+} | sort -u
diff --git a/libexec/plenv-init b/libexec/plenv-init
@@ -22,9 +22,10 @@ done
 
 shell="$1"
 if [ -z "$shell" ]; then
-  shell="$(ps c -p $(ps -p $$ -o 'ppid=' 2>/dev/null) -o 'comm=' 2>/dev/null || true)"
+  shell="$(ps c -p $PPID -o 'comm=' 2>/dev/null || true)"
   shell="${shell##-}"
-  shell="$(basename "${shell:-$SHELL}")"
+  shell="${shell:-$SHELL}"
+  shell="${shell##*/}"
 fi
 
 READLINK=$(type -p greadlink readlink | while read line; do echo $line; break; done)

diff --git a/libexec/plenv-sh-rehash b/libexec/plenv-sh-rehash
@@ -7,7 +7,8 @@ if [ "$1" = "--complete" ]; then
   exec plenv-rehash --complete
 fi
 
-shell="($basename "${PLENV_SHELL:-$SHELL}")"
+shell="${PLENV_SHELL:-$SHELL}"
+shell="${shell##*/}"
 
 # When plenv shell integration is enabled, delegate to plenv-rehash,
 # then tell the shell to empty its command lookup cache.

diff --git a/libexec/plenv-sh-shell b/libexec/plenv-sh-shell
@@ -24,7 +24,8 @@ if [ "$1" = "--complete" ]; then
 fi
 
 version="$1"
-shell="$(basename "${PLENV_SHELL:-$SHELL}")"
+shell="${PLENV_SHELL:-$SHELL}"
+shell="${shell##*/}"
 
 if [ -z "$version" ]; then
   if [ -z "$PLENV_VERSION" ]; then