csonto/bash-completion
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sbopkg, slackpkg, slapt-{get,src}: Use shorter form of the check if file exists.

Browse Source 
Also add information about corresponding man pages.
This commit is contained in:
Igor Murzov 2012-01-12 19:54:06 +04:00
parent 32e8f33018
commit 33883145af
5 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
completions/sbopkg
View File

@ -1,4 +1,4 @@
# bash completion for sbopkg tool -*- shell-script -*- # bash completion for sbopkg(8) -*- shell-script -*-
_sbopkg() _sbopkg()
{ {
@ -44,10 +44,7 @@ _sbopkg()
fi fi
done done
if [[ ! -r "$config" ]]; then [[ -r "$config" ]] || return
return
fi
. $config . $config
for (( i=1; i<${#words[@]}; i++ )); do for (( i=1; i<${#words[@]}; i++ )); do
@ -61,10 +58,8 @@ _sbopkg()
;; ;;
esac esac
done done
[[ -r $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT ]] || return
if [[ ! -r $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT ]]; then
return
fi
COMPREPLY=( $( sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}"\ COMPREPLY=( $( sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}"\
$REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT ) $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT )
$( cd $QUEUEDIR; compgen -f -X "!*.sqf" -- "$cur" ) ) $( cd $QUEUEDIR; compgen -f -X "!*.sqf" -- "$cur" ) )

6
completions/slackpkg
View File

@ -1,4 +1,4 @@
# bash completion for slackpkg tool -*- shell-script -*- # bash completion for slackpkg(8) -*- shell-script -*-
# options list is based on `grep '\-.*\=.*)' /usr/sbin/slackpkg | cut -f1 -d\)` # options list is based on `grep '\-.*\=.*)' /usr/sbin/slackpkg | cut -f1 -d\)`
_slackpkg() _slackpkg()
@ -43,9 +43,7 @@ _slackpkg()
local confdir="/etc/slackpkg" local confdir="/etc/slackpkg"
local config="$confdir/slackpkg.conf" local config="$confdir/slackpkg.conf"
if [[ ! -r "$config" ]]; then [[ -r "$config" ]] || return
return
fi
. "$config" . "$config"
local i action local i action

6
completions/slapt-get
View File

@ -1,4 +1,4 @@
# slapt-get completion -*- shell-script -*- # slapt-get(8) completion -*- shell-script -*-
_slapt_get() _slapt_get()
{ {
@ -48,9 +48,7 @@ _slapt_get()
break break
fi fi
done done
if [[ ! -r "$config" ]]; then [[ -r "$config" ]] || return
return
fi
case $t in case $t in
all) # --show all) # --show

6
completions/slapt-src
View File

@ -1,4 +1,4 @@
# slapt-src completion -*- shell-script -*- # slapt-src(8) completion -*- shell-script -*-
_slapt_src() _slapt_src()
{ {
@ -42,9 +42,7 @@ _slapt_src()
break break
fi fi
done done
if [[ ! -r "$config" ]]; then [[ -r "$config" ]] || return
return
fi
if [[ "$cur" == *:* ]]; then if [[ "$cur" == *:* ]]; then
local name=${cur%:*} local name=${cur%:*}

6
test/lib/completions/slapt-get.exp
View File

@ -24,6 +24,12 @@ assert_complete "--update --upgrade" "slapt-get --up" $test
sync_after_int sync_after_int
set test "--install should not complete anything if config doesn't exist"
assert_no_complete "slapt-get -c non-existent-file --install " $test
sync_after_int
set test "--install should complete available packages" set test "--install should complete available packages"
set config $::srcdir/fixtures/slackware/etc/slapt-get/slapt-getrc set config $::srcdir/fixtures/slackware/etc/slapt-get/slapt-getrc