Merge pull request #71 from soubinan/features

fix typos

.github/workflows/trigger.yml

@@ -15,6 +15,16 @@ on:
   schedule:
     - cron: "0 0 */7 * *"
   workflow_dispatch:
+    inputs:
+      logLevel:
+        description: "Log level"
+        required: true
+        default: "warning"
+        type: choice
+        options:
+          - warning
+          - info
+          - debug
 
 jobs:
   init:

__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
 

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