Browse Source

Merge pull request #464 from andrewflbarnes/bugfix/readlink-resolution

fix: force PATH search when resolving greadlink and readlink
pull/465/head
Barnesly 1 week ago committed by GitHub
parent
commit
71c5bfdaa3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      libexec/jenv
  2. 2
      libexec/jenv-doctor
  3. 2
      libexec/jenv-hooks
  4. 2
      libexec/jenv-init
  5. 2
      libexec/jenv-plugins
  6. 4
      libexec/jenv-refresh-plugins
  7. 4
      libexec/jenv-refresh-versions

2
libexec/jenv

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

2
libexec/jenv-doctor

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

2
libexec/jenv-hooks

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

2
libexec/jenv-init

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

2
libexec/jenv-plugins

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

4
libexec/jenv-refresh-plugins

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
resolve_link() {
if [ -L "$1" ]; then
$(type -p greadlink readlink | head -1) "$1"
$(type -P greadlink readlink | head -1) "$1"
fi
}
@ -42,4 +42,4 @@ if [ ! "$lastVersion" == "$currentVersion" ] || [ $FORCE_REFRESH == "1" ]; then @@ -42,4 +42,4 @@ if [ ! "$lastVersion" == "$currentVersion" ] || [ $FORCE_REFRESH == "1" ]; then
done
fi
echo "$currentVersion" > "${JENV_ROOT}/jenv.version"
echo "$currentVersion" > "${JENV_ROOT}/jenv.version"

4
libexec/jenv-refresh-versions

@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
resolve_link() {
if [ -L "$1" ]; then
$(type -p greadlink readlink | head -1) "$1"
$(type -P greadlink readlink | head -1) "$1"
fi
}
@ -22,4 +22,4 @@ for path in "${JENV_ROOT}/versions/"*; do @@ -22,4 +22,4 @@ for path in "${JENV_ROOT}/versions/"*; do
echo "$aliasname has been replaced by $newalias"
fi
fi
done
done

Loading…
Cancel
Save