From 3c9185272d1af21cd976a548f932d7554a3bb533 Mon Sep 17 00:00:00 2001 From: Matthew Martin Date: Thu, 21 Jan 2016 13:31:34 -0600 Subject: 37725: Completion: _init_d: add OpenBSD bits --- Completion/Unix/Command/_init_d | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) (limited to 'Completion/Unix/Command/_init_d') diff --git a/Completion/Unix/Command/_init_d b/Completion/Unix/Command/_init_d index bbf62fc0d..2bb8d538c 100644 --- a/Completion/Unix/Command/_init_d +++ b/Completion/Unix/Command/_init_d @@ -1,6 +1,7 @@ #compdef -p */(init|rc[0-9S]#).d/* local cmds script +local -a flags _compskip=all @@ -41,6 +42,23 @@ if [[ $OSTYPE = freebsd* ]]; then return 0 } +elif [[ $OSTYPE = openbsd* ]]; then + (( $+functions[_init_d_fullpath] )) || + _init_d_fullpath() { + echo /etc/rc.d/$1 + return 0 + } + + (( $+functions[_init_d_get_cmds] )) || + _init_d_get_cmds() { + local -a cmds disabled + + cmds=(start stop reload restart check) + disabled=(${${${(M)${(f)"$(< $script)"}:#rc_(${(~j:|:)cmds})=NO}#rc_}%=NO}) + echo ${cmds:|disabled} + } + + flags=('-d[print debug information]' '-f[forcibly start the daemon]') else (( $+functions[_init_d_fullpath] )) || _init_d_fullpath() { @@ -90,4 +108,4 @@ cmds=( $(_init_d_get_cmds) ) || return (( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds || cmds=(start stop) -_sub_commands $cmds +_arguments -s -A "-*" $flags ':init.d command:_sub_commands $cmds' -- cgit v1.2.3 From a090acab63c02900e86bd268fc9194fccf459d08 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Fri, 29 Jan 2016 09:14:49 +0000 Subject: unposted: _init_d: Report failure to caller. --- ChangeLog | 5 +++++ Completion/Unix/Command/_init_d | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'Completion/Unix/Command/_init_d') diff --git a/ChangeLog b/ChangeLog index 266570b41..eaf8f838c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-01-29 Daniel Shahaf + + * unposted: Completion/Unix/Command/_init_d: _init_d: Report + failure to caller. + 2016-01-28 Eric Cook * 37814: Kamil Dudka: Functions/Misc/run-help-ip: use /bin/zsh diff --git a/Completion/Unix/Command/_init_d b/Completion/Unix/Command/_init_d index 2bb8d538c..03af2dc9b 100644 --- a/Completion/Unix/Command/_init_d +++ b/Completion/Unix/Command/_init_d @@ -103,7 +103,7 @@ fi script=$words[1] [[ $script = */* ]] || script="$(_init_d_fullpath "$script")" -cmds=( $(_init_d_get_cmds) ) || return +cmds=( $(_init_d_get_cmds) ) || return 1 (( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds || cmds=(start stop) -- cgit v1.2.3