Merge pull request #463 from kevinburkesegment/fix-readlink-uutils

fix: add symlink check before calling readlink for uutils compatibility

libexec/jenv

@@ -3,7 +3,9 @@ set -e
 [ -n "$JENV_DEBUG" ] && set -x
 
 resolve_link() {
-  $(type -p greadlink readlink | head -1) "$1"
+  if [ -L "$1" ]; then
+    $(type -p greadlink readlink | head -1) "$1"
+  fi
 }
 
 abs_dirname() {

libexec/jenv-doctor

@@ -26,7 +26,9 @@ function cfix() {
 }
 
 resolve_link() {
-  $(type -p greadlink readlink | head -1) "$1"
+  if [ -L "$1" ]; then
+    $(type -p greadlink readlink | head -1) "$1"
+  fi
 }
 
 set -e

libexec/jenv-hooks

@@ -25,7 +25,9 @@ if [ -z $shell ]; then
 fi
 
 resolve_link() {
-  $(type -p greadlink readlink | head -1) $1
+  if [ -L "$1" ]; then
+    $(type -p greadlink readlink | head -1) "$1"
+  fi
 }
 
 realpath() {

libexec/jenv-init

@@ -30,7 +30,9 @@ if [ -z "$shell" ]; then
 fi
 
 resolve_link() {
-  $(type -p greadlink readlink | head -1) $1
+  if [ -L "$1" ]; then
+    $(type -p greadlink readlink | head -1) "$1"
+  fi
 }
 
 abs_dirname() {

libexec/jenv-plugins

@@ -14,7 +14,9 @@ fi
 
 
 resolve_link() {
-  $(type -p greadlink readlink | head -1) "$1"
+  if [ -L "$1" ]; then
+    $(type -p greadlink readlink | head -1) "$1"
+  fi
 }
 
 samedir()  {

libexec/jenv-refresh-plugins

@@ -2,7 +2,9 @@
 # Summary: Refresh plugins links
 
 resolve_link() {
-  $(type -p greadlink readlink | head -1) "$1"
+  if [ -L "$1" ]; then
+    $(type -p greadlink readlink | head -1) "$1"
+  fi
 }       
                   
 set -e

libexec/jenv-refresh-versions

@@ -2,7 +2,9 @@
 # Summary: Refresh alias names
      
 resolve_link() {
-  $(type -p greadlink readlink | head -1) "$1"
+  if [ -L "$1" ]; then
+    $(type -p greadlink readlink | head -1) "$1"
+  fi
 }       
                   
 set -e