From da8150235a7343a712e763c28eb411373bd3ec0f Mon Sep 17 00:00:00 2001
From: Alexandre <44178713+alexbelgium@users.noreply.github.com>
Date: Mon, 11 Mar 2024 11:10:20 +0100
Subject: [PATCH] Update 99-run.sh

---
 comixed/rootfs/etc/cont-init.d/99-run.sh | 71 ++++++++++++------------
 1 file changed, 37 insertions(+), 34 deletions(-)

diff --git a/comixed/rootfs/etc/cont-init.d/99-run.sh b/comixed/rootfs/etc/cont-init.d/99-run.sh
index e391dbe54..878133f64 100755
--- a/comixed/rootfs/etc/cont-init.d/99-run.sh
+++ b/comixed/rootfs/etc/cont-init.d/99-run.sh
@@ -20,37 +20,39 @@ fi
 # NGINX SETTING #
 #################
 
-#declare port
-#declare certfile
-declare ingress_interface
-declare ingress_port
-#declare keyfile
-
-FB_BASEURL="$(bashio::addon.ingress_entry)"
-export FB_BASEURL
-
-declare ADDON_PROTOCOL=http
-# Generate Ingress configuration
-if bashio::config.true 'ssl'; then
-    ADDON_PROTOCOL=https
-fi
-
-#port=$(bashio::addon.port 80)
-ingress_port=$(bashio::addon.ingress_port)
-ingress_interface=$(bashio::addon.ip_address)
-sed -i "s|%%protocol%%|${ADDON_PROTOCOL}|g" /etc/nginx/servers/ingress.conf
-sed -i "s|%%port%%|${ingress_port}|g" /etc/nginx/servers/ingress.conf
-sed -i "s|%%interface%%|${ingress_interface}|g" /etc/nginx/servers/ingress.conf
-sed -i "s|%%subpath%%|${FB_BASEURL}/|g" /etc/nginx/servers/ingress.conf
-mkdir -p /var/log/nginx && touch /var/log/nginx/error.log
-
-# Correct baseurl
-for file in /config/hypercorn.toml $(find /usr -name hypercorn.toml.default); do
-    if [ -f "$file" ]; then
-        sed -i "/root_path/d" "$file"
-        sed -i "1a root_path = \"${FB_BASEURL}\"" "$file"
+if [[ "$INGRESS" == "true" ]]; then
+    #declare port
+    #declare certfile
+    declare ingress_interface
+    declare ingress_port
+    #declare keyfile
+    
+    FB_BASEURL="$(bashio::addon.ingress_entry)"
+    export FB_BASEURL
+    
+    declare ADDON_PROTOCOL=http
+    # Generate Ingress configuration
+    if bashio::config.true 'ssl'; then
+        ADDON_PROTOCOL=https
     fi
-done
+    
+    #port=$(bashio::addon.port 80)
+    ingress_port=$(bashio::addon.ingress_port)
+    ingress_interface=$(bashio::addon.ip_address)
+    sed -i "s|%%protocol%%|${ADDON_PROTOCOL}|g" /etc/nginx/servers/ingress.conf
+    sed -i "s|%%port%%|${ingress_port}|g" /etc/nginx/servers/ingress.conf
+    sed -i "s|%%interface%%|${ingress_interface}|g" /etc/nginx/servers/ingress.conf
+    sed -i "s|%%subpath%%|${FB_BASEURL}/|g" /etc/nginx/servers/ingress.conf
+    mkdir -p /var/log/nginx && touch /var/log/nginx/error.log
+    
+    # Correct baseurl
+    for file in /config/hypercorn.toml $(find /usr -name hypercorn.toml.default); do
+        if [ -f "$file" ]; then
+            sed -i "/root_path/d" "$file"
+            sed -i "1a root_path = \"${FB_BASEURL}\"" "$file"
+        fi
+    done
+fi
 
 ##############
 # LAUNCH APP #
@@ -63,8 +65,9 @@ bashio::log.warning "Username: comixedreader@localhost Password: comixedreader"
 bashio::log.info "Starting..."
 
 # shellcheck disable=SC2086
-/./app/comixed-release*/bin/run.sh -L /config/comixed.log & true
+/./app/comixed-release*/bin/run.sh -L /config/comixed.log
 
-bashio::net.wait_for 7171 localhost 900 || true
-bashio::log.info "Started !"
-exec nginx
+#& true
+#bashio::net.wait_for 7171 localhost 900 || true
+#bashio::log.info "Started !"
+#exec nginx