XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Checking global directory for completions as well

pull/1043/head
Nils Winkler 2017-09-15 08:10:15 +02:00
parent 607c9cd049
commit ec327486ef
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
completion/available/bash-it.completion.bash
View File

@ -31,9 +31,11 @@ _bash-it-comp-list-available-not-enabled()
_bash-it-comp-list-enabled() _bash-it-comp-list-enabled()
{ {
local subdirectory="$1" local subdirectory="$1"
local suffix enabled_things
# TODO Check for global directory as well suffix=$(echo "$subdirectory" | sed -e 's/plugins/plugin/g')
local enabled_things=$(for f in `compgen -G "${BASH_IT}/$subdirectory/enabled/*.bash" | sort`;
enabled_things=$(for f in `sort <(compgen -G "${BASH_IT}/$subdirectory/enabled/*.${suffix}.bash") <(compgen -G "${BASH_IT}/enabled/*.${suffix}.bash")`;
do do
basename $f | cut -d'.' -f1 | sed -e "s/^[0-9]*---//g" basename $f | cut -d'.' -f1 | sed -e "s/^[0-9]*---//g"
done) done)

9
test/completion/bash-it.completion.bats
View File

@ -77,6 +77,9 @@ function __check_completion () {
ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/aliases/enabled/atom.aliases.bash ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/aliases/enabled/atom.aliases.bash
assert [ -L "$BASH_IT/aliases/enabled/atom.aliases.bash" ] assert [ -L "$BASH_IT/aliases/enabled/atom.aliases.bash" ]
ln -s $BASH_IT/completion/available/apm.completion.bash $BASH_IT/completion/enabled/apm.completion.bash
assert [ -L "$BASH_IT/completion/enabled/apm.completion.bash" ]
run __check_completion 'bash-it disable alias a' run __check_completion 'bash-it disable alias a'
assert_line "0" "all atom" assert_line "0" "all atom"
} }
@ -85,6 +88,9 @@ function __check_completion () {
ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/aliases/enabled/150---atom.aliases.bash ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/aliases/enabled/150---atom.aliases.bash
assert [ -L "$BASH_IT/aliases/enabled/150---atom.aliases.bash" ] assert [ -L "$BASH_IT/aliases/enabled/150---atom.aliases.bash" ]
ln -s $BASH_IT/completion/available/apm.completion.bash $BASH_IT/completion/enabled/350---apm.completion.bash
assert [ -L "$BASH_IT/completion/enabled/350---apm.completion.bash" ]
run __check_completion 'bash-it disable alias a' run __check_completion 'bash-it disable alias a'
assert_line "0" "all atom" assert_line "0" "all atom"
} }
@ -93,6 +99,9 @@ function __check_completion () {
ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/enabled/150---atom.aliases.bash ln -s $BASH_IT/aliases/available/atom.aliases.bash $BASH_IT/enabled/150---atom.aliases.bash
assert [ -L "$BASH_IT/enabled/150---atom.aliases.bash" ] assert [ -L "$BASH_IT/enabled/150---atom.aliases.bash" ]
ln -s $BASH_IT/completion/available/apm.completion.bash $BASH_IT/enabled/350---apm.completion.bash
assert [ -L "$BASH_IT/enabled/350---apm.completion.bash" ]
run __check_completion 'bash-it disable alias a' run __check_completion 'bash-it disable alias a'
assert_line "0" "all atom" assert_line "0" "all atom"
} }