Skip to content

Commit da26178

Browse files
committed
fix(_comp_sysvdirs): work around nounset
1 parent 20041ea commit da26178

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.
@@ -1931,7 +1931,7 @@ _comp_compgen_xinetd_services()
19311931
_comp_compgen_services()
19321932
{
19331933
local sysvdirs
1934-
_comp_sysvdirs
1934+
_comp_sysvdirs || return 1
19351935

19361936
local services
19371937
_comp_expand_glob services '${sysvdirs[0]}/!($_comp_backup_glob|functions|README)'
@@ -1972,7 +1972,7 @@ _service()
19721972
[[ -e /etc/mandrake-release ]] && _comp_compgen_xinetd_services
19731973
else
19741974
local sysvdirs
1975-
_comp_sysvdirs
1975+
_comp_sysvdirs || return 1
19761976
_comp_compgen_split -l -- "$(command sed -e 'y/|/ /' \
19771977
-ne 's/^.*\(U\|msg_u\)sage.*{\(.*\)}.*$/\2/p' \
19781978
"${sysvdirs[0]}/${prev##*/}" 2>/dev/null) start stop"
@@ -1983,12 +1983,12 @@ _service()
19831983
_comp__init_set_up_service_completions()
19841984
{
19851985
local sysvdirs svc svcdir
1986-
_comp_sysvdirs
1987-
for svcdir in "${sysvdirs[@]}"; do
1988-
for svc in "$svcdir"/!($_comp_backup_glob); do
1989-
[[ -x $svc ]] && complete -F _service "$svc"
1986+
_comp_sysvdirs &&
1987+
for svcdir in "${sysvdirs[@]}"; do
1988+
for svc in "$svcdir"/!($_comp_backup_glob); do
1989+
[[ -x $svc ]] && complete -F _service "$svc"
1990+
done
19901991
done
1991-
done
19921992
unset -f "$FUNCNAME"
19931993
}
19941994
_comp__init_set_up_service_completions

0 commit comments

Comments
 (0)