From 7c1370ac00012fc57973767b78b550b62d41bf19 Mon Sep 17 00:00:00 2001 From: Nick Silva Date: Tue, 19 Jul 2016 11:12:36 -0700 Subject: [PATCH 1/3] Add support for custom alias group with alias help command. --- lib/helpers.bash | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/lib/helpers.bash b/lib/helpers.bash index c95f8d96..f2894762 100644 --- a/lib/helpers.bash +++ b/lib/helpers.bash @@ -340,19 +340,35 @@ _help-aliases() _example '$ alias-help git' if [ -n "$1" ]; then - cat $BASH_IT/aliases/available/$1.aliases.bash | metafor alias | sed "s/$/'/" + case $1 in + custom) + alias_path='custom.aliases.bash' + ;; + *) + alias_path="available/$1.aliases.bash" + ;; + esac + cat $BASH_IT/aliases/$alias_path | metafor alias | sed "s/$/'/" else - typeset f + local f for f in $BASH_IT/aliases/enabled/* do - typeset file=$(basename $f) - printf '\n\n%s:\n' "${file%%.*}" - # metafor() strips trailing quotes, restore them with sed.. - cat $f | metafor alias | sed "s/$/'/" + echo $f + _help-list-aliases $f done + echo $BASH_IT/aliases/custom.aliases.bash + _help-list-aliases $BASH_IT/aliases/custom.aliases.bash fi } +_help-list-aliases () +{ + local file=$(basename $1) + printf '\n\n%s:\n' "${file%%.*}" + # metafor() strips trailing quotes, restore them with sed.. + cat $1 | metafor alias | sed "s/$/'/" +} + _help-plugins() { _about 'summarize all functions defined by enabled bash-it plugins' From 7c8be52ac5e2ce8591af727ae4332d571e9bb5e4 Mon Sep 17 00:00:00 2001 From: Nick Silva Date: Tue, 19 Jul 2016 11:17:49 -0700 Subject: [PATCH 2/3] Revert local variable declaration --- lib/helpers.bash | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/helpers.bash b/lib/helpers.bash index f2894762..3b5f59b2 100644 --- a/lib/helpers.bash +++ b/lib/helpers.bash @@ -350,7 +350,7 @@ _help-aliases() esac cat $BASH_IT/aliases/$alias_path | metafor alias | sed "s/$/'/" else - local f + typeset f for f in $BASH_IT/aliases/enabled/* do echo $f @@ -363,7 +363,7 @@ _help-aliases() _help-list-aliases () { - local file=$(basename $1) + typeset file=$(basename $1) printf '\n\n%s:\n' "${file%%.*}" # metafor() strips trailing quotes, restore them with sed.. cat $1 | metafor alias | sed "s/$/'/" From bbcb50ca2b57eef7c731596d7ddc66ddd1e0e630 Mon Sep 17 00:00:00 2001 From: Nick Silva Date: Tue, 19 Jul 2016 11:38:36 -0700 Subject: [PATCH 3/3] Remove stray debugging echoes --- lib/helpers.bash | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/helpers.bash b/lib/helpers.bash index 3b5f59b2..5224c86d 100644 --- a/lib/helpers.bash +++ b/lib/helpers.bash @@ -353,10 +353,8 @@ _help-aliases() typeset f for f in $BASH_IT/aliases/enabled/* do - echo $f _help-list-aliases $f done - echo $BASH_IT/aliases/custom.aliases.bash _help-list-aliases $BASH_IT/aliases/custom.aliases.bash fi }