From 1393c96729ec1a4f82350778bbff5050d3632196 Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Sun, 28 May 2017 13:01:00 -0400 Subject: [PATCH 1/6] --list drops the './' prefix from alias names --- bin/nodenv-alias | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/nodenv-alias b/bin/nodenv-alias index 7a799f4..d1b9b89 100755 --- a/bin/nodenv-alias +++ b/bin/nodenv-alias @@ -23,7 +23,7 @@ list() { local dir for dir in $(echo_lines ./*); do if [ -L "$dir" ]; then - echo "$dir => $(resolve_link "$dir")" + echo "${dir#\./} => $(resolve_link "$dir")" exit=0 fi done From 435efc183fffc297f1fef68253a1aaf3e65e50f8 Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Sun, 28 May 2017 13:03:39 -0400 Subject: [PATCH 2/6] Refactors symlink listings --- bin/nodenv-alias | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/bin/nodenv-alias b/bin/nodenv-alias index d1b9b89..96e74b4 100755 --- a/bin/nodenv-alias +++ b/bin/nodenv-alias @@ -20,12 +20,10 @@ resolve_link() { list() { local exit=1 - local dir - for dir in $(echo_lines ./*); do - if [ -L "$dir" ]; then - echo "${dir#\./} => $(resolve_link "$dir")" - exit=0 - fi + local link + for link in $(echo_lines_with_symlinks ./*); do + echo "$link => $(resolve_link "$link")" + exit=0 done return $exit } @@ -40,10 +38,10 @@ cleanup_invalid() { done } -echo_lines() { - local line - for line in "$@"; do - echo "$line" +echo_lines_with_symlinks() { + local file + for file in "$@"; do + [ -L "$file" ] && echo "${file#\./}" done } From 48fa999f652dcae751445386137e252ed66cccd9 Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Sun, 28 May 2017 13:18:06 -0400 Subject: [PATCH 3/6] Completion stops suggesting non-links as aliases --- bin/nodenv-alias | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/nodenv-alias b/bin/nodenv-alias index 96e74b4..c7e07ef 100755 --- a/bin/nodenv-alias +++ b/bin/nodenv-alias @@ -100,7 +100,7 @@ if [ --complete = "$1" ]; then elif [ "$#" = 0 ]; then echo --auto echo --list - { point_releases; nodenv-versions --bare; } | sort -u + { point_releases; echo_lines_with_symlinks ./*; } | sort -u fi exit 0 fi From 356dfd0743616f4db717f327f6f39208751a8653 Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Sun, 28 May 2017 11:54:49 -0400 Subject: [PATCH 4/6] shellcheck fix --- bin/nodenv-alias | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/nodenv-alias b/bin/nodenv-alias index c7e07ef..82cc4ee 100755 --- a/bin/nodenv-alias +++ b/bin/nodenv-alias @@ -48,7 +48,7 @@ echo_lines_with_symlinks() { echo_lines_without_symlinks() { local file for file in "$@"; do - [ ! -L "$file" ] && echo "$file" + [ ! -L "$file" ] && echo "${file#\./}" done } @@ -79,7 +79,7 @@ auto_symlink_point() { } point_releases() { - echo_lines_without_symlinks *.*.* | sed -e 's/\.[^-.]*$//' -e 's/-[^.]*$//' | sort -u + echo_lines_without_symlinks ./*.*.* | sed -e 's/\.[^-.]*$//' -e 's/-[^.]*$//' | sort -u } abort() { From 478d59b78c73d704b771ae71ae085b1add0322c7 Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Sun, 28 May 2017 13:34:45 -0400 Subject: [PATCH 5/6] Completion stops additional completions for --list --- bin/nodenv-alias | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/nodenv-alias b/bin/nodenv-alias index 82cc4ee..b662358 100755 --- a/bin/nodenv-alias +++ b/bin/nodenv-alias @@ -93,7 +93,7 @@ abort() { # Provide nodenv completions if [ --complete = "$1" ]; then shift - if [ "$#" = 1 ]; then + if [ "$#" = 1 ] && [ "$1" != --list ]; then echo --auto echo --remove nodenv-versions --bare From 0d9140e33f39289843c8539eb3c1df6c9e03cb2b Mon Sep 17 00:00:00 2001 From: Jason Karns Date: Sun, 28 May 2017 13:55:16 -0400 Subject: [PATCH 6/6] 1.1.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ea6673..32d7338 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nodenv-aliases", - "version": "1.1.1", + "version": "1.1.2", "private": true, "description": "Create aliases for nodenv Node versions", "homepage": "https://github.com/nodenv/nodenv-aliases#readme",