From 20b51e3af79eed43793972f1bdbb0218fbfc8330 Mon Sep 17 00:00:00 2001
From: Soubinan <contact@soubinan.tk>
Date: Tue, 14 Jan 2025 16:37:27 -0500
Subject: [PATCH 1/4] still noticing issues with event triggering, try another
 fix

---
 .github/workflows/trigger.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.github/workflows/trigger.yml b/.github/workflows/trigger.yml
index 4b01b1c..c81f3f1 100644
--- a/.github/workflows/trigger.yml
+++ b/.github/workflows/trigger.yml
@@ -15,6 +15,13 @@ on:
   schedule:
     - cron: "0 0 */7 * *"
   workflow_dispatch:
+    inputs:
+      logLevel:
+        description: "Log level"
+        required: true
+        default: "warning"
+      tags:
+        description: "Manual run"
 
 jobs:
   init:

From 2eb5c01b6a28512e7583790d160c77dffacefb2e Mon Sep 17 00:00:00 2001
From: Soubinan <contact@soubinan.tk>
Date: Tue, 14 Jan 2025 22:03:39 -0500
Subject: [PATCH 2/4] fix var typo and exclude next-router process from
 listening message

---
 __layout.k | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/__layout.k b/__layout.k
index 0981b8f..5529d7a 100644
--- a/__layout.k
+++ b/__layout.k
@@ -1037,7 +1037,7 @@ _welcome_msg_cron = """\
 _welcome_msg_script = """\
 #!/bin/bash
 
-ports=$(ss -ptln "sport > :1023 or sport = :80 or sport = :443" | grep -vE 'systemd|127.0.0.|%lo|::1|Netid|Local' | awk '{print $4}' | awk -F: '{print $NF}' | sort -u)
+ports=$(ss -ptln "sport > :1023 or sport = :80 or sport = :443" | grep -vE 'systemd|127.0.0.|%lo|::1|Netid|Local|next-router' | awk '{print $4}' | awk -F: '{print $NF}' | sort -u)
 ips=$(ip a|grep 'inet '|grep -v '127.0.0'|awk '{print $2}')
 
 printf '\\n'
@@ -1131,14 +1131,15 @@ rm /etc/*-
 """
 _script_preparations = """\
 #!/bin/bash
-set -eux
 
 tee /usr/sbin/systemctl <<EOF
 #!/bin/bash
-if [[ "$1" == "start" || "$1" == "restart" || "$1" == "try-restart" || "$1" == "reload" || "$1" == "stop" ]]; then
-    echo "Skipping $1 command for $2 as requested by policy."
+
+if [[ "\$1" == "start" || "\$1" == "restart" || "\$1" == "try-restart" || "\$1" == "reload" || "\$1" == "stop" ]]; then
+    echo "Skipping \$1 command for \$2 as requested by policy."
 else
-    /usr/bin/systemctl "$@"
+    echo "/usr/bin/systemctl \$@"
+    /usr/bin/systemctl "\$@"
 fi
 EOF
 

From 1ee0fe481b40d9363d416864d0bc4d761fe0eaa3 Mon Sep 17 00:00:00 2001
From: Soubinan <contact@soubinan.tk>
Date: Tue, 14 Jan 2025 22:04:05 -0500
Subject: [PATCH 3/4] build cli earlier

---
 templates/homarr.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/homarr.yml b/templates/homarr.yml
index e37b519..97c8cb4 100644
--- a/templates/homarr.yml
+++ b/templates/homarr.yml
@@ -35,7 +35,7 @@ instructions:
         . /opt/homarr/settings.env
         set +a
 
-        node /app/cli/cli.js "$@"'
+        node /app/cli/cli.js "$@"
 
     - path: /etc/systemd/system/homarr.service
       generator: dump
@@ -340,12 +340,14 @@ instructions:
         cp tsconfig.json migrate/tsconfig.json
         touch migrate/yarn.lock
         yarn db:migrate
+        cd /app/cli
+        yarn --immutable
+        yarn cache clean
+        cd /app
         yarn cache clean
         rm -rf node_modules
         cp -r .next/standalone/* .
         chmod +x scripts/run.sh
-        cd /app/cli && yarn --immutable
-        yarn cache clean
         touch .installed__
 
         systemctl enable homarr.service

From e14ee8c8d2ac37568b95ed6fe0b98da0c5165ccb Mon Sep 17 00:00:00 2001
From: Soubinan <contact@soubinan.tk>
Date: Tue, 14 Jan 2025 22:12:39 -0500
Subject: [PATCH 4/4] add choices for logLevel

---
 .github/workflows/trigger.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/trigger.yml b/.github/workflows/trigger.yml
index c81f3f1..5007aba 100644
--- a/.github/workflows/trigger.yml
+++ b/.github/workflows/trigger.yml
@@ -20,8 +20,11 @@ on:
         description: "Log level"
         required: true
         default: "warning"
-      tags:
-        description: "Manual run"
+        type: choice
+        options:
+          - warning
+          - info
+          - debug
 
 jobs:
   init: