emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opts -> extra_commands. This is much more descriptive.

Browse Source
This commit is contained in:
Roy Marples
2007-11-20 18:19:48 +00:00
parent 6a6ef66d15
commit a76f2c20e4
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sh/rc-help.sh
View File

@@ -54,12 +54,12 @@ else
NL=
fi
default_opts="describe help start status stop restart zap"
extra_opts="$(. "${myscript}" 2>/dev/null ; echo "${opts}")"
default_commands="describe help start status stop restart zap"
extra_commands="$(. "${myscript}" 2>/dev/null ; echo "${extra_commands:-${opts}}")"
printf "Usage: ${CYAN}${SERVICE}${OFF} [ ${GREEN}flags${OFF} ] < ${GREEN}options${OFF} >
${CYAN}Normal Options:${OFF}"
${CYAN}Normal Commands:${OFF}"
if [ "${BE_VERBOSE}" = "yes" ] ; then
printf "
@@ -115,16 +115,16 @@ printf "
else
printf " ${GREEN}${default_opts}${OFF}
printf " ${GREEN}${default_commands}${OFF}
Default init.d options.
"
fi
if [ -n "${extra_opts}" ] ; then
if [ -n "${extra_commands}" ] ; then
printf "
${CYAN}Additional Options:${OFF}${NL}
${GREEN}${extra_opts}${OFF}
${GREEN}${extra_commands}${OFF}
Extra options supported by this init.d script.
"
fi

4
sh/runscript.sh
View File

@@ -49,7 +49,7 @@ describe() {
fi
local svc= desc=
for svc in ${opts}; do
for svc in ${extra_commands:-${opts}}; do
eval desc=\$description_${svc}
if [ -n "${desc}" ]; then
einfo "${HILITE}${svc}${NORMAL}: ${desc}"
@@ -128,7 +128,7 @@ fi
while [ -n "$1" ]; do
# See if we have the required function and run it
for rc_x in describe start stop ${opts}; do
for rc_x in describe start stop ${extra_commands:-${opts}}; do
if [ "${rc_x}" = "$1" ]; then
if type "$1" >/dev/null 2>&1; then
unset rc_x