Merge branch 'master' into patch-1

This commit is contained in:
Rico Sta. Cruz 2017-10-25 17:39:36 +08:00 committed by GitHub
commit 4723ad3bf2
3 changed files with 3 additions and 2 deletions

View File

@ -8,6 +8,7 @@ Features
Fixed Bugs
* `asdf list` now outputs ref-versions as used on `.tool-versions` file (#243)
* `asdf update` will explicitly use the `origin` remote when updating tags (#231)
* All code is now linted by shellcheck (#223)

View File

@ -43,7 +43,7 @@ Depending on your OS and shell, run the following:
> For most plugins, it is good if you have installed the following packages OR their equivalent on your OS
> * **OS X**: Install these via homebrew `coreutils automake autoconf openssl libyaml readline libxslt libtool unixodbc`
> * **macOS**: Install these via homebrew `coreutils automake autoconf openssl libyaml readline libxslt libtool unixodbc`
> * **Ubuntu**: `automake autoconf libreadline-dev libncurses-dev libssl-dev libyaml-dev libxslt-dev libffi-dev libtool unixodbc-dev`
> * **Fedora**: `automake autoconf readline-devel ncurses-devel openssl-devel libyaml-devel libxslt-devel libffi-devel libtool unixODBC-devel`

View File

@ -48,7 +48,7 @@ list_installed_versions() {
if [ -d "$plugin_installs_path" ]; then
# shellcheck disable=SC2045
for install in $(ls -d "${plugin_installs_path}"/*/ 2>/dev/null); do
basename "$install"
basename "$install" | sed 's/^ref-/ref:/'
done
fi
}