Update 'root/usr/libexec/apps/nodered/nodered.sh'

root/usr/libexec/apps/nodered/nodered.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 
-APP_NAME="nodered"
+APP_NAME="node-red"
 
-ACTION=${1}
+ACTION="${1}"
 shift 1
 
 get_image() {
@@ -16,9 +16,10 @@ do_install_detail() {
   IMAGE_NAME=$(uci get nodered.@nodered[0].image_name 2>/dev/null)
   username=$(uci get nodered.@nodered[0].username 2>/dev/null)
   password=$(uci get nodered.@nodered[0].password 2>/dev/null)
-  APP_NAME="nodered"
-  GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
-  GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c14; echo)
+  APP_NAME="node-red"
+
+  GEN_PASS=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c 14; echo)
+  GEN_PASS2=$(< /dev/urandom tr -dc A-Za-z0-9 2>/dev/null | head -c 14; echo)
 
   LAN_IP=$(uci get network.lan.ipaddr)
   LAN_IP="${LAN_IP%/*}"
@@ -31,10 +32,9 @@ do_install_detail() {
   [ -z "$port" ] && port=1880
   [ -z "$IMAGE_NAME" ] && IMAGE_NAME="nodered/node-red:latest"
 
-  rm -R /opt/docker2/compose/nodered-app
-  mkdir /opt/docker2/compose/nodered-app
+  rm -r /opt/docker2/compose/nodered-app 2>/dev/null
+  mkdir -p /opt/docker2/compose/nodered-app
 
-  touch /opt/docker2/compose/nodered-app/docker-compose.yml
   cat > /opt/docker2/compose/nodered-app/docker-compose.yml <<EOF
 version: '3.7'
 services:
@@ -69,41 +69,41 @@ usage() {
   echo "      port                   Node-RED port"
 }
 
-case ${ACTION} in
-  "install"|"upgrade")
+case "${ACTION}" in
+  "install" | "upgrade")
     do_install_detail
-  ;;
+    ;;
   "rm")
     IMAGE_NAME=$(uci get nodered.@nodered[0].image_name 2>/dev/null)
     [ -z "$IMAGE_NAME" ] && IMAGE_NAME="nodered/node-red:latest"
     CONTAINER_IDS=$(docker ps -a --filter "ancestor=${IMAGE_NAME}" --format '{{.ID}}')
     echo "Stopping and removing containers..."
     for ID in $CONTAINER_IDS; do
-      docker stop $ID
-      docker rm $ID
+      docker stop "$ID"
+      docker rm "$ID"
     done
-    docker rmi -f $IMAGE_NAME
-    rm -R /opt/docker2/compose/nodered-app
-  ;;
-  "start"|"stop"|"restart")
-    APP_NAME="nodered"
+    docker rmi -f "$IMAGE_NAME"
+    rm -r /opt/docker2/compose/nodered-app  2>/dev/null
+    ;;
+  "start" | "stop" | "restart")
+    APP_NAME="node-red"
     CONTAINER_IDS=$(docker ps -a --filter "ancestor=${APP_NAME}" --format '{{.ID}}')
     for ID in $CONTAINER_IDS; do
-      docker ${ACTION} ${ID}
+      docker "${ACTION}" "${ID}"
     done
-  ;;
+    ;;
   "status")
-    APP_NAME="nodered"
-    CONTAINER_NAMES=$(docker ps -a --filter "ancestor=${APP_NAME}" --format '{{.Names}}')
+    APP_NAME="node-red"
+    CONTAINER_NAMES=$(docker ps -a --filter "name=${APP_NAME}" --format '{{.Names}}')
     docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Status}}'
-  ;;
+    ;;
   "port")
-    APP_NAME="nodered"
+    APP_NAME="node-red"
     CONTAINER_NAMES=$(docker ps -a --filter "ancestor=${APP_NAME}" --format '{{.Names}}')
-    docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
-  ;;
+    docker ps --all -f "name=${CONTAINER_NAMES}" --format '{{.Ports}}' | grep -o -m1 '0.0.0.0:[0-9]*' | sed 's/0.0.0.0://'
+    ;;
   *)
     usage
     exit 1
-  ;;
+    ;;
 esac