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

Revert "Another stab at making service completion work on Slackware."

Browse Source 
This reverts commit 1a01e54d856fe2d9496cfaf6d9df8b75d87a9b52.
See http://thread.gmane.org/gmane.comp.shells.bash.completion.scm/2278
This commit is contained in:
Igor Murzov 2011-11-09 04:49:37 +03:00
parent cb0526cb01
commit fff412b2f2
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bash_completion
View File

@ -1043,12 +1043,9 @@ _backup_glob='@(#*#|*@(~|.@(bak|orig|rej|swp|dpkg*|rpm@(orig|new|save))))'
# #
_services() _services()
{ {
local sysvdir=/etc/init.d famdir=/etc/xinetd.d local sysvdir famdir
if [[ -d /etc/rc.d/init.d ]]; then [ -d /etc/rc.d/init.d ] && sysvdir=/etc/rc.d/init.d || sysvdir=/etc/init.d
sysvdir=/etc/rc.d/init.d famdir=/etc/xinetd.d
elif [[ -f /etc/slackware-version ]]; then
sysvdir=/etc/rc.d
fi
local restore_nullglob=$(shopt -p nullglob); shopt -s nullglob local restore_nullglob=$(shopt -p nullglob); shopt -s nullglob
@ -1841,8 +1838,7 @@ _completion_loader()
[[ $BASH_SOURCE == */* ]] && compdir="${BASH_SOURCE%/*}/completions" [[ $BASH_SOURCE == */* ]] && compdir="${BASH_SOURCE%/*}/completions"
# Special case for init.d scripts. # Special case for init.d scripts.
if [[ $1 == /etc?(/rc.d)/init.d/* || \ if [[ $1 == /etc?(/rc.d)/init.d/* ]]; then
( $1 == /etc/rc.d/* && -f /etc/slackware-version ) ]]; then
. "$compdir/service" &>/dev/null && return 124 || return 1 . "$compdir/service" &>/dev/null && return 124 || return 1
fi fi

20
completions/service
View File

@ -15,12 +15,9 @@ _service()
if [[ $cword -eq 1 && $prev == ?(*/)service ]]; then if [[ $cword -eq 1 && $prev == ?(*/)service ]]; then
_services _services
else else
local sysvdir=/etc/init.d local sysvdir
if [[ -d /etc/rc.d/init.d ]]; then [ -d /etc/rc.d/init.d ] && \
sysvdir=/etc/rc.d/init.d sysvdir=/etc/rc.d/init.d || sysvdir=/etc/init.d
elif [[ -f /etc/slackware-version ]]; then
sysvdir=/etc/rc.d
fi
COMPREPLY=( $( compgen -W '`sed -e "y/|/ /" \ COMPREPLY=( $( compgen -W '`sed -e "y/|/ /" \
-ne "s/^.*\(U\|msg_u\)sage.*{\(.*\)}.*$/\2/p" \ -ne "s/^.*\(U\|msg_u\)sage.*{\(.*\)}.*$/\2/p" \
$sysvdir/${prev##*/} 2>/dev/null` start stop' -- "$cur" ) ) $sysvdir/${prev##*/} 2>/dev/null` start stop' -- "$cur" ) )
@ -29,14 +26,9 @@ _service()
return 0 return 0
} && } &&
complete -F _service service complete -F _service service
for svc in /etc/init.d/!($_backup_glob) /etc/rc.d/init.d/!($_backup_glob); do
svcdirs=( /etc/init.d /etc/rc.d/init.d ) [ -x "$svc" ] && complete -F _service $svc
[[ -f /etc/slackware-version ]] && svcdirs=( /etc/rc.d )
for svcdir in ${svcdirs[@]}; do
for svc in $svcdir/!($_backup_glob); do
[ -x "$svc" ] && complete -F _service $svc
done
done done
unset svc svcdir svcdirs unset svc
# ex: ts=4 sw=4 et filetype=sh # ex: ts=4 sw=4 et filetype=sh