From 3ee34dcb0224bb95e937b199a0415ddb11fa9102 Mon Sep 17 00:00:00 2001
From: Albrecht Lohofener <albrechtloh@gmx.de>
Date: Wed, 25 Sep 2024 10:50:09 +0200
Subject: [PATCH] Fix luci_forwarding with wrong configuration

---
 src/helpers.sh        |  2 +-
 src/init_container.sh | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/helpers.sh b/src/helpers.sh
index c1a34d9..96b4bc8 100644
--- a/src/helpers.sh
+++ b/src/helpers.sh
@@ -3,7 +3,7 @@ set -Eeuo pipefail
 
 info () { printf "%b%s%b" "\E[1;34m❯ \E[1;36m" "$1" "\E[0m\n"; }
 error () { printf "%b%s%b" "\E[1;31m❯ " "ERROR: $1" "\E[0m\n" >&2; }
-warn () { printf "%b%s%b" "\E[1;31m❯ " "Warning: $1" "\E[0m\n" >&2; }
+warn () { printf "%b%s%b" "\E[1;31m❯ " "Warning: $1" "\E[0m\n"; }
 
 trap 'error "Status $? while: $BASH_COMMAND (line $LINENO/$BASH_LINENO)"' ERR
 
diff --git a/src/init_container.sh b/src/init_container.sh
index bd43655..f79bdf7 100644
--- a/src/init_container.sh
+++ b/src/init_container.sh
@@ -77,21 +77,19 @@ if [[ $FORWARD_LUCI = "true" ]]; then
   if [[ $LAN_IF = "veth" ]]; then
     info "Enable LuCI forwading to host LAN at port 9000"
 
-    multirun \
+    exec multirun \
     "/var/lib/script-server-env/bin/python /usr/share/script-server/launcher.py -d /var/script-server" \
     "nginx" \
     "/run/run_openwrt.sh" \
     "nsenter --target 1 --uts --net --ipc nginx -c /var/www/nginx-luci.conf"
 
   else
-    error "LuCI forwading is only available if enviroment variable is set to LAN_IF: 'veth'"
+    warn "LuCI forwading is only available if enviroment variable is set to LAN_IF: 'veth'"
   fi
-else
+fi
 
-  # Start processes
-  multirun \
-    "/var/lib/script-server-env/bin/python /usr/share/script-server/launcher.py -d /var/script-server" \
-    "nginx" \
-    "/run/run_openwrt.sh"
-
-fi
\ No newline at end of file
+# Start processes
+exec multirun \
+  "/var/lib/script-server-env/bin/python /usr/share/script-server/launcher.py -d /var/script-server" \
+  "nginx" \
+  "/run/run_openwrt.sh"
\ No newline at end of file