Fix run regex

Author: thespad

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

@@ -16,12 +16,12 @@ if [[ -n "${CONFIG_FILE}" ]] && [[ ! -e "${CONFIG_FILE}" ]]; then
     s6-rc -bad change
 fi
 
-if { echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--run|-r)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; } && { echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--config|-c)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; }; then
+if { echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--run|-r)([^\S]|$)'; } && { echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--config|-c)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; }; then
     s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py ${CLI_OPTIONS}
-elif echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--run|-r)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; then
-    s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" ${CLI_OPTIONS:+"$CLI_OPTIONS"}
+elif echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--run|-r)([^\S]|$)'; then
+    s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" ${CLI_OPTIONS}
 elif echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--config|-c)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; then
     s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --run ${CLI_OPTIONS}
 else
-    s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --run --config "${CONFIG_FILE}" ${CLI_OPTIONS:+"$CLI_OPTIONS"}
+    s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --run --config "${CONFIG_FILE}" ${CLI_OPTIONS}
 fi

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

@@ -16,16 +16,16 @@ if [[ -n "${CONFIG_FILE}" ]] && [[ ! -e "${CONFIG_FILE}" ]]; then
     s6-rc -bad change
 fi
 
-if { echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--time|-t)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; } && { echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--config|-c)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; }; then
+if { echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--time|-t)([^\S])'; } && { echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--config|-c)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; }; then
     exec \
-        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py ${CLI_OPTIONS:+"$CLI_OPTIONS"}
-elif echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--time|-t)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; then
+        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py ${CLI_OPTIONS}
+elif echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--time|-t)([^\S])'; then
     exec \
-        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" ${CLI_OPTIONS:+"$CLI_OPTIONS"}
+        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" ${CLI_OPTIONS}
 elif echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--config|-c)([^\S])(.+\/[^\/]+)\.(yml|yaml)'; then
     exec \
-        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --time "${PMM_TIME:-03:00}" ${CLI_OPTIONS:+"$CLI_OPTIONS"}
+        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --time "${PMM_TIME:-03:00}" ${CLI_OPTIONS}
 else
     exec \
-        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" --time "${PMM_TIME:-03:00}" ${CLI_OPTIONS:+"$CLI_OPTIONS"}
+        s6-setuidgid abc python3 /app/pmm/plex_meta_manager.py --config "${CONFIG_FILE}" --time "${PMM_TIME:-03:00}" ${CLI_OPTIONS}
 fi

root/init-hook

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-if [[ $(tr "[:upper:]" "[:lower:]" <<<"${PMM_RUN}") = "true" ]] || [[ ${CLI_OPTIONS} = *"-r"* ]] || [[ ${CLI_OPTIONS} = *"--run"* ]]; then
+if [[ $(tr "[:upper:]" "[:lower:]" <<<"${PMM_RUN}") = "true" ]] || echo "${CLI_OPTIONS}" | grep -qPo '[\s]?(--run|-r)([^\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