openrc-hook: final refactor

openrc/scripts/openrc-hook

@@ -1,44 +1,51 @@
 #!/bin/sh -e
 
 openrc_live() {
-  if [ ! -f /run/openrc/softlevel ]; then
-    echo >&2 "  Skipped: Current root is not booted."
-    exit 0
-  fi
+    if [ ! -f /run/openrc/softlevel ]; then
+        echo >&2 "  Skipped: Current root is not booted."
+        exit 0
+    fi
+}
+
+each_conf() {
+    while read -r f; do
+        "$@" "/$f"
+    done
 }
 
 svc_help(){
-    echo "	==> Start/stop/restart a service:"
-    echo "	rc-service <service> <start/stop/restart>"
+    arg="${1:-}"
+    str="${arg#--*}"
+    if [ -n "$str" ]; then
+        echo "	==> Start/stop/restart a $str service:"
+    else
+        echo "	==> Start/stop/restart a service:"
+    fi
+    echo "	rc-service <service> <start/stop/restart>" "$arg"
 }
 
 svc_add_help(){
-    echo "	==> Add a service to runlevel:"
-    echo "	rc-update add <service> <runlevel>"
-    svc_help
+    arg="${1:-}"
+    str="${arg#--*}"
+    if [ -n "$str" ]; then
+        echo "	==> Add a $str service to runlevel:"
+    else
+        echo "	==> Add a service to runlevel:"
+    fi
+    echo "	rc-update add <service> <runlevel>" "$arg"
+    svc_help "$arg"
 }
 
 svc_del_help(){
-    echo "	==> Remove a service from runlevel:"
-    echo "	rc-update del <service> <runlevel>"
-    svc_help
-}
-
-svc_user_help(){
-    echo "	==> Start/stop/restart a service:"
-    echo "	rc-service -U <service> <start/stop/restart>"
-}
-
-svc_user_add_help(){
-    echo "	==> Add a user service to runlevel:"
-    echo "	rc-update -U add <service> <runlevel>"
-    svc_help
-}
-
-svc_user_del_help(){
-    echo "	==> Remove a user service from runlevel:"
-    echo "	rc-update -U del <service> <runlevel>"
-    svc_help
+    arg="${1:-}"
+    str="${arg#--*}"
+    if [ -n "$str" ]; then
+        echo "	==> Remove a $str service from runlevel:"
+    else
+        echo "	==> Remove a service from runlevel:"
+    fi
+    echo "	rc-update del <service> <runlevel>" "$arg"
+    svc_help "$arg"
 }
 
 svc_user_ln() {
@@ -55,25 +62,19 @@ svc_user_ln() {
     done
 }
 
-each_conf() {
-  while read -r f; do
-    "$@" "/$f"
-  done
-}
-
 op="$1"; shift
 
 case $op in
-  sysctl) openrc_live; each_conf /usr/bin/sysctl -q -p ;;
-  binfmt) openrc_live; each_conf /usr/lib/openrc/sh/binfmt.sh ;;
-  reexec) svc_user_ln; openrc_live; /usr/bin/openrc-shutdown -R ;;
-  # For use by other packages
-  reload) openrc_live; /usr/bin/rc-service "$@" reload ;;
-  add) svc_add_help ;;
-  del) svc_del_help ;;
-  uadd) svc_user_add_help ;;
-  udel) svc_user_del_help ;;
-  *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
+    sysctl) openrc_live; each_conf /usr/bin/sysctl -q -p ;;
+    binfmt) openrc_live; each_conf /usr/lib/openrc/sh/binfmt.sh ;;
+    reexec) svc_user_ln; openrc_live; /usr/bin/openrc-shutdown -R ;;
+    # For use by other packages
+    reload) openrc_live; /usr/bin/rc-service "$@" reload ;;
+    add) svc_add_help ;;
+    del) svc_del_help ;;
+    uadd) svc_add_help "--user" ;;
+    udel) svc_del_help "--user" ;;
+    *) echo >&2 "  Invalid operation '$op'"; exit 1 ;;
 esac
 
 exit 0