Skip to content

Commit 7f41408

Browse files
committed
fix(_comp_sysvdirs): work around nounset
1 parent b40ed12 commit 7f41408

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

bash_completion

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ _comp_sysvdirs()
115115
[[ -d /etc/init.d ]] && sysvdirs+=(/etc/init.d)
116116
# Slackware uses /etc/rc.d
117117
[[ -f /etc/slackware-version ]] && sysvdirs=(/etc/rc.d)
118-
return 0
118+
((${#sysvdirs[@]}))
119119
}
120120

121121
# This function checks whether we have a given program on the system.
@@ -1935,7 +1935,7 @@ _comp_compgen_xinetd_services()
19351935
_comp_compgen_services()
19361936
{
19371937
local sysvdirs
1938-
_comp_sysvdirs
1938+
_comp_sysvdirs || return 1
19391939

19401940
local services
19411941
_comp_expand_glob services '${sysvdirs[0]}/!($_comp_backup_glob|functions|README)'
@@ -1976,7 +1976,7 @@ _service()
19761976
[[ -e /etc/mandrake-release ]] && _comp_compgen_xinetd_services
19771977
else
19781978
local sysvdirs
1979-
_comp_sysvdirs
1979+
_comp_sysvdirs || return 1
19801980
_comp_compgen_split -l -- "$(command sed -e 'y/|/ /' \
19811981
-ne 's/^.*\(U\|msg_u\)sage.*{\(.*\)}.*$/\2/p' \
19821982
"${sysvdirs[0]}/${prev##*/}" 2>/dev/null) start stop"
@@ -1987,12 +1987,12 @@ _service()
19871987
_comp__init_set_up_service_completions()
19881988
{
19891989
local sysvdirs svc svcdir
1990-
_comp_sysvdirs
1991-
for svcdir in "${sysvdirs[@]}"; do
1992-
for svc in "$svcdir"/!($_comp_backup_glob); do
1993-
[[ -x $svc ]] && complete -F _service "$svc"
1990+
_comp_sysvdirs &&
1991+
for svcdir in "${sysvdirs[@]}"; do
1992+
for svc in "$svcdir"/!($_comp_backup_glob); do
1993+
[[ -x $svc ]] && complete -F _service "$svc"
1994+
done
19941995
done
1995-
done
19961996
unset -f "$FUNCNAME"
19971997
}
19981998
_comp__init_set_up_service_completions

0 commit comments

Comments
 (0)