Properly handle CLI options that imply --run

Author: thespad

root/etc/s6-overlay/s6-rc.d/init-pmm-oneshot/run

@@ -5,8 +5,8 @@ IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
 cd / || exit 1
 
 # halt startup if no config file is found
-if [[ -n ${PMM_CONFIG} ]]; then
-    CONFIG_FILE=${PMM_CONFIG}
+if [[ -n "${PMM_CONFIG}" ]]; then
+    CONFIG_FILE="${PMM_CONFIG}"
 elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; then
     CONFIG_FILE=$(echo "${CLI_OPTIONS[@]}" | grep -Po '([\s]|^)(--config|-c)([\s])\K(.+\/[^\/]+)\.(yml|yaml)')
 else

root/etc/s6-overlay/s6-rc.d/svc-pmm/run

@@ -5,8 +5,8 @@ IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
 cd / || exit 1
 
 # halt startup if no config file is found
-if [[ -n ${PMM_CONFIG} ]]; then
-    CONFIG_FILE=${PMM_CONFIG}
+if [[ -n "${PMM_CONFIG}" ]]; then
+    CONFIG_FILE="${PMM_CONFIG}"
 elif echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--config|-c)([\s])(.+\/[^\/]+)\.(yml|yaml)'; then
     CONFIG_FILE=$(echo "${CLI_OPTIONS[@]}" | grep -Po '([\s]|^)(--config|-c)([\s])\K(.+\/[^\/]+)\.(yml|yaml)')
 else

root/init-hook

@@ -2,7 +2,7 @@
 
 IFS="|" read -r -a CLI_OPTIONS <<< "$CLI_OPTIONS_STRING"
 
-if [[ $(tr "[:upper:]" "[:lower:]" <<<"${PMM_RUN}") = "true" ]] || echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--run|-r)([\s]|$)'; then
+if [[ $(tr "[:upper:]" "[:lower:]" <<<"${PMM_RUN}") = "true" ]] || echo "${CLI_OPTIONS[@]}" | grep -qPo '([\s]|^)(--run|--tests|--run-tests|--run-collections|--run-libraries|--run-metadata-files|--resume|-r|-rm|-rl|-rc|-rt|re)([\s]|$)'; then
     rm -rf /etc/s6-overlay/s6-rc.d/svc-pmm
     rm -rf /etc/s6-overlay/s6-rc.d/user/contents.d/svc-pmm
     rm -rf /etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-pmm-config