From 84374590a47ad1883f52742db086803f399f696c Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Wed, 28 Feb 2024 22:31:08 +0100
Subject: [PATCH] Fix issues found by shellcheck.

---
 docker/proxy/entrypoint.sh  |  34 +++++------
 docker/server/entrypoint.sh | 114 ++++++++++++++++++------------------
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/docker/proxy/entrypoint.sh b/docker/proxy/entrypoint.sh
index 64aae11..882cd0d 100755
--- a/docker/proxy/entrypoint.sh
+++ b/docker/proxy/entrypoint.sh
@@ -36,52 +36,52 @@ if [ ! -f "$CONFIG" ]; then
   echo "Preparing signaling proxy configuration in $CONFIG ..."
   cp /config/proxy.conf.in "$CONFIG"
 
-  if [ ! -z "$HTTP_LISTEN" ]; then
+  if [ -n "$HTTP_LISTEN" ]; then
     sed -i "s|#listen = 127.0.0.1:9090|listen = $HTTP_LISTEN|" "$CONFIG"
   fi
 
-  if [ ! -z "$COUNTRY" ]; then
+  if [ -n "$COUNTRY" ]; then
     sed -i "s|#country =.*|country = $COUNTRY|" "$CONFIG"
   fi
 
   HAS_ETCD=
-  if [ ! -z "$ETCD_ENDPOINTS" ]; then
+  if [ -n "$ETCD_ENDPOINTS" ]; then
     sed -i "s|#endpoints =.*|endpoints = $ETCD_ENDPOINTS|" "$CONFIG"
     HAS_ETCD=1
   else
-    if [ ! -z "$ETCD_DISCOVERY_SRV" ]; then
+    if [ -n "$ETCD_DISCOVERY_SRV" ]; then
       sed -i "s|#discoverysrv =.*|discoverysrv = $ETCD_DISCOVERY_SRV|" "$CONFIG"
       HAS_ETCD=1
     fi
-    if [ ! -z "$ETCD_DISCOVERY_SERVICE" ]; then
+    if [ -n "$ETCD_DISCOVERY_SERVICE" ]; then
       sed -i "s|#discoveryservice =.*|discoveryservice = $ETCD_DISCOVERY_SERVICE|" "$CONFIG"
     fi
   fi
-  if [ ! -z "$HAS_ETCD" ]; then
-    if [ ! -z "$ETCD_CLIENT_KEY" ]; then
+  if [ -n "$HAS_ETCD" ]; then
+    if [ -n "$ETCD_CLIENT_KEY" ]; then
       sed -i "s|#clientkey = /path/to/etcd-client.key|clientkey = $ETCD_CLIENT_KEY|" "$CONFIG"
     fi
-    if [ ! -z "$ETCD_CLIENT_CERTIFICATE" ]; then
+    if [ -n "$ETCD_CLIENT_CERTIFICATE" ]; then
       sed -i "s|#clientcert = /path/to/etcd-client.crt|clientcert = $ETCD_CLIENT_CERTIFICATE|" "$CONFIG"
     fi
-    if [ ! -z "$ETCD_CLIENT_CA" ]; then
+    if [ -n "$ETCD_CLIENT_CA" ]; then
       sed -i "s|#cacert = /path/to/etcd-ca.crt|cacert = $ETCD_CLIENT_CA|" "$CONFIG"
     fi
   fi
 
-  if [ ! -z "$JANUS_URL" ]; then
+  if [ -n "$JANUS_URL" ]; then
     sed -i "s|url =.*|url = $JANUS_URL|" "$CONFIG"
   else
     sed -i "s|url =.*|#url =|" "$CONFIG"
   fi
-  if [ ! -z "$MAX_STREAM_BITRATE" ]; then
+  if [ -n "$MAX_STREAM_BITRATE" ]; then
     sed -i "s|#maxstreambitrate =.*|maxstreambitrate = $MAX_STREAM_BITRATE|" "$CONFIG"
   fi
-  if [ ! -z "$MAX_SCREEN_BITRATE" ]; then
+  if [ -n "$MAX_SCREEN_BITRATE" ]; then
     sed -i "s|#maxscreenbitrate =.*|maxscreenbitrate = $MAX_SCREEN_BITRATE|" "$CONFIG"
   fi
 
-  if [ ! -z "$TOKENS_ETCD" ]; then
+  if [ -n "$TOKENS_ETCD" ]; then
     if [ -z "$HAS_ETCD" ]; then
       echo "No etcd endpoint configured, can't use etcd for proxy tokens"
       exit 1
@@ -89,7 +89,7 @@ if [ ! -f "$CONFIG" ]; then
 
     sed -i "s|tokentype =.*|tokentype = etcd|" "$CONFIG"
 
-    if [ ! -z "$TOKEN_KEY_FORMAT" ]; then
+    if [ -n "$TOKEN_KEY_FORMAT" ]; then
       sed -i "s|#keyformat =.*|keyformat = $TOKEN_KEY_FORMAT|" "$CONFIG"
     fi
   else
@@ -98,15 +98,15 @@ if [ ! -f "$CONFIG" ]; then
     echo "[tokens]" >> "$CONFIG"
     for token in $TOKENS; do
       declare var="TOKEN_${token^^}_KEY"
-      var=$(echo $var | sed "s|\.|_|")
-      if [ ! -z "${!var}" ]; then
+      var=${var//./_}
+      if [ -n "${!var}" ]; then
         echo "$token = ${!var}" >> "$CONFIG"
       fi
     done
     echo >> "$CONFIG"
   fi
 
-  if [ ! -z "$STATS_IPS" ]; then
+  if [ -n "$STATS_IPS" ]; then
     sed -i "s|#allowed_ips =.*|allowed_ips = $STATS_IPS|" "$CONFIG"
   fi
 fi
diff --git a/docker/server/entrypoint.sh b/docker/server/entrypoint.sh
index 49939fd..3665b5e 100755
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@@ -36,75 +36,75 @@ if [ ! -f "$CONFIG" ]; then
   echo "Preparing signaling server configuration in $CONFIG ..."
   cp /config/server.conf.in "$CONFIG"
 
-  if [ ! -z "$HTTP_LISTEN" ]; then
+  if [ -n "$HTTP_LISTEN" ]; then
     sed -i "s|#listen = 127.0.0.1:8080|listen = $HTTP_LISTEN|" "$CONFIG"
   fi
-  if [ ! -z "$HTTPS_LISTEN" ]; then
+  if [ -n "$HTTPS_LISTEN" ]; then
     sed -i "s|#listen = 127.0.0.1:8443|listen = $HTTPS_LISTEN|" "$CONFIG"
 
-    if [ ! -z "$HTTPS_CERTIFICATE" ]; then
+    if [ -n "$HTTPS_CERTIFICATE" ]; then
       sed -i "s|certificate = /etc/nginx/ssl/server.crt|certificate = $HTTPS_CERTIFICATE|" "$CONFIG"
     fi
-    if [ ! -z "$HTTPS_KEY" ]; then
+    if [ -n "$HTTPS_KEY" ]; then
       sed -i "s|key = /etc/nginx/ssl/server.key|key = $HTTPS_KEY|" "$CONFIG"
     fi
   fi
 
-  if [ ! -z "$HASH_KEY" ]; then
+  if [ -n "$HASH_KEY" ]; then
     sed -i "s|the-secret-for-session-checksums|$HASH_KEY|" "$CONFIG"
   fi
-  if [ ! -z "$BLOCK_KEY" ]; then
+  if [ -n "$BLOCK_KEY" ]; then
     sed -i "s|-encryption-key-|$BLOCK_KEY|" "$CONFIG"
   fi
-  if [ ! -z "$INTERNAL_SHARED_SECRET_KEY" ]; then
+  if [ -n "$INTERNAL_SHARED_SECRET_KEY" ]; then
     sed -i "s|the-shared-secret-for-internal-clients|$INTERNAL_SHARED_SECRET_KEY|" "$CONFIG"
   fi
-  if [ ! -z "$NATS_URL" ]; then
+  if [ -n "$NATS_URL" ]; then
     sed -i "s|#url = nats://localhost:4222|url = $NATS_URL|" "$CONFIG"
   else
     sed -i "s|#url = nats://localhost:4222|url = nats://loopback|" "$CONFIG"
   fi
 
   HAS_ETCD=
-  if [ ! -z "$ETCD_ENDPOINTS" ]; then
+  if [ -n "$ETCD_ENDPOINTS" ]; then
     sed -i "s|#endpoints =.*|endpoints = $ETCD_ENDPOINTS|" "$CONFIG"
     HAS_ETCD=1
   else
-    if [ ! -z "$ETCD_DISCOVERY_SRV" ]; then
+    if [ -n "$ETCD_DISCOVERY_SRV" ]; then
       sed -i "s|#discoverysrv =.*|discoverysrv = $ETCD_DISCOVERY_SRV|" "$CONFIG"
       HAS_ETCD=1
     fi
-    if [ ! -z "$ETCD_DISCOVERY_SERVICE" ]; then
+    if [ -n "$ETCD_DISCOVERY_SERVICE" ]; then
       sed -i "s|#discoveryservice =.*|discoveryservice = $ETCD_DISCOVERY_SERVICE|" "$CONFIG"
     fi
   fi
-  if [ ! -z "$HAS_ETCD" ]; then
-    if [ ! -z "$ETCD_CLIENT_KEY" ]; then
+  if [ -n "$HAS_ETCD" ]; then
+    if [ -n "$ETCD_CLIENT_KEY" ]; then
       sed -i "s|#clientkey = /path/to/etcd-client.key|clientkey = $ETCD_CLIENT_KEY|" "$CONFIG"
     fi
-    if [ ! -z "$ETCD_CLIENT_CERTIFICATE" ]; then
+    if [ -n "$ETCD_CLIENT_CERTIFICATE" ]; then
       sed -i "s|#clientcert = /path/to/etcd-client.crt|clientcert = $ETCD_CLIENT_CERTIFICATE|" "$CONFIG"
     fi
-    if [ ! -z "$ETCD_CLIENT_CA" ]; then
+    if [ -n "$ETCD_CLIENT_CA" ]; then
       sed -i "s|#cacert = /path/to/etcd-ca.crt|cacert = $ETCD_CLIENT_CA|" "$CONFIG"
     fi
   fi
 
-  if [ ! -z "$USE_JANUS" ]; then
+  if [ -n "$USE_JANUS" ]; then
     sed -i "s|#type =$|type = janus|" "$CONFIG"
-    if [ ! -z "$JANUS_URL" ]; then
+    if [ -n "$JANUS_URL" ]; then
       sed -i "/proxy URLs to connect to/{n;s|#url =$|url = $JANUS_URL|}" "$CONFIG"
     fi
-  elif [ ! -z "$USE_PROXY" ]; then
+  elif [ -n "$USE_PROXY" ]; then
     sed -i "s|#type =$|type = proxy|" "$CONFIG"
-    if [ ! -z "$PROXY_TOKEN_ID" ]; then
+    if [ -n "$PROXY_TOKEN_ID" ]; then
       sed -i "s|#token_id =.*|token_id = $PROXY_TOKEN_ID|" "$CONFIG"
     fi
-    if [ ! -z "$PROXY_TOKEN_KEY" ]; then
+    if [ -n "$PROXY_TOKEN_KEY" ]; then
       sed -i "s|#token_key =.*|token_key = $PROXY_TOKEN_KEY|" "$CONFIG"
     fi
 
-    if [ ! -z "$PROXY_ETCD" ]; then
+    if [ -n "$PROXY_ETCD" ]; then
       if [ -z "$HAS_ETCD" ]; then
         echo "No etcd endpoint configured, can't use etcd for proxy connections"
         exit 1
@@ -112,73 +112,73 @@ if [ ! -f "$CONFIG" ]; then
 
       sed -i "s|#urltype = static|urltype = etcd|" "$CONFIG"
 
-      if [ ! -z "$PROXY_KEY_PREFIX" ]; then
+      if [ -n "$PROXY_KEY_PREFIX" ]; then
         sed -i "s|#keyprefix =.*|keyprefix = $PROXY_KEY_PREFIX|" "$CONFIG"
       fi
     else
-      if [ ! -z "$PROXY_URLS" ]; then
+      if [ -n "$PROXY_URLS" ]; then
         sed -i "/proxy URLs to connect to/{n;s|#url =$|url = $PROXY_URLS|}" "$CONFIG"
       fi
-      if [ ! -z "$PROXY_DNS_DISCOVERY" ]; then
+      if [ -n "$PROXY_DNS_DISCOVERY" ]; then
         sed -i "/or deleted as necessary/{n;s|#dnsdiscovery =.*|dnsdiscovery = true|}" "$CONFIG"
       fi
     fi
   fi
 
-  if [ ! -z "$MAX_STREAM_BITRATE" ]; then
+  if [ -n "$MAX_STREAM_BITRATE" ]; then
     sed -i "s|#maxstreambitrate =.*|maxstreambitrate = $MAX_STREAM_BITRATE|" "$CONFIG"
   fi
-  if [ ! -z "$MAX_SCREEN_BITRATE" ]; then
+  if [ -n "$MAX_SCREEN_BITRATE" ]; then
     sed -i "s|#maxscreenbitrate =.*|maxscreenbitrate = $MAX_SCREEN_BITRATE|" "$CONFIG"
   fi
 
-  if [ ! -z "$SKIP_VERIFY" ]; then
+  if [ -n "$SKIP_VERIFY" ]; then
     sed -i "s|#skipverify =.*|skipverify = $SKIP_VERIFY|" "$CONFIG"
   fi
 
-  if [ ! -z "$TURN_API_KEY" ]; then
+  if [ -n "$TURN_API_KEY" ]; then
     sed -i "s|#\?apikey =.*|apikey = $TURN_API_KEY|" "$CONFIG"
   fi
-  if [ ! -z "$TURN_SECRET" ]; then
+  if [ -n "$TURN_SECRET" ]; then
     sed -i "/same as on the TURN server/{n;s|#\?secret =.*|secret = $TURN_SECRET|}" "$CONFIG"
   fi
-  if [ ! -z "$TURN_SERVERS" ]; then
+  if [ -n "$TURN_SERVERS" ]; then
     sed -i "s|#servers =.*|servers = $TURN_SERVERS|" "$CONFIG"
   fi
 
-  if [ ! -z "$GEOIP_LICENSE" ]; then
+  if [ -n "$GEOIP_LICENSE" ]; then
     sed -i "s|#license =.*|license = $GEOIP_LICENSE|" "$CONFIG"
   fi
-  if [ ! -z "$GEOIP_URL" ]; then
+  if [ -n "$GEOIP_URL" ]; then
     sed -i "/looking up IP addresses/{n;s|#url =$|url = $GEOIP_URL|}" "$CONFIG"
   fi
 
-  if [ ! -z "$STATS_IPS" ]; then
+  if [ -n "$STATS_IPS" ]; then
     sed -i "s|#allowed_ips =.*|allowed_ips = $STATS_IPS|" "$CONFIG"
   fi
 
-  if [ ! -z "$GRPC_LISTEN" ]; then
+  if [ -n "$GRPC_LISTEN" ]; then
     sed -i "s|#listen = 0.0.0.0:9090|listen = $GRPC_LISTEN|" "$CONFIG"
 
-    if [ ! -z "$GRPC_SERVER_CERTIFICATE" ]; then
+    if [ -n "$GRPC_SERVER_CERTIFICATE" ]; then
       sed -i "s|#servercertificate =.*|servercertificate = $GRPC_SERVER_CERTIFICATE|" "$CONFIG"
     fi
-    if [ ! -z "$GRPC_SERVER_KEY" ]; then
+    if [ -n "$GRPC_SERVER_KEY" ]; then
       sed -i "s|#serverkey =.*|serverkey = $GRPC_SERVER_KEY|" "$CONFIG"
     fi
-    if [ ! -z "$GRPC_SERVER_CA" ]; then
+    if [ -n "$GRPC_SERVER_CA" ]; then
       sed -i "s|#serverca =.*|serverca = $GRPC_SERVER_CA|" "$CONFIG"
     fi
-    if [ ! -z "$GRPC_CLIENT_CERTIFICATE" ]; then
+    if [ -n "$GRPC_CLIENT_CERTIFICATE" ]; then
       sed -i "s|#clientcertificate =.*|clientcertificate = $GRPC_CLIENT_CERTIFICATE|" "$CONFIG"
     fi
-    if [ ! -z "$GRPC_CLIENT_KEY" ]; then
+    if [ -n "$GRPC_CLIENT_KEY" ]; then
       sed -i "s|#clientkey = /path/to/grpc-client.key|clientkey = $GRPC_CLIENT_KEY|" "$CONFIG"
     fi
-    if [ ! -z "$GRPC_CLIENT_CA" ]; then
+    if [ -n "$GRPC_CLIENT_CA" ]; then
       sed -i "s|#clientca =.*|clientca = $GRPC_CLIENT_CA|" "$CONFIG"
     fi
-    if [ ! -z "$GRPC_ETCD" ]; then
+    if [ -n "$GRPC_ETCD" ]; then
       if [ -z "$HAS_ETCD" ]; then
         echo "No etcd endpoint configured, can't use etcd for GRPC"
         exit 1
@@ -186,50 +186,50 @@ if [ ! -f "$CONFIG" ]; then
 
       sed -i "s|#targettype =$|targettype = etcd|" "$CONFIG"
 
-      if [ ! -z "$GRPC_TARGET_PREFIX" ]; then
+      if [ -n "$GRPC_TARGET_PREFIX" ]; then
         sed -i "s|#targetprefix =.*|targetprefix = $GRPC_TARGET_PREFIX|" "$CONFIG"
       fi
     else
-      if [ ! -z "$GRPC_TARGETS" ]; then
+      if [ -n "$GRPC_TARGETS" ]; then
         sed -i "s|#targets =.*|targets = $GRPC_TARGETS|" "$CONFIG"
 
-        if [ ! -z "$GRPC_DNS_DISCOVERY" ]; then
+        if [ -n "$GRPC_DNS_DISCOVERY" ]; then
           sed -i "/# deleted as necessary/{n;s|#dnsdiscovery =.*|dnsdiscovery = true|}" "$CONFIG"
         fi
       fi
     fi
   fi
 
-  if [ ! -z "$GEOIP_OVERRIDES" ]; then
+  if [ -n "$GEOIP_OVERRIDES" ]; then
     sed -i "s|\[geoip-overrides\]|#[geoip-overrides]|" "$CONFIG"
     echo >> "$CONFIG"
     echo "[geoip-overrides]" >> "$CONFIG"
     for override in $GEOIP_OVERRIDES; do
-      echo $override >> "$CONFIG"
+      echo "$override" >> "$CONFIG"
     done
     echo >> "$CONFIG"
   fi
 
-  if [ ! -z "$CONTINENT_OVERRIDES" ]; then
+  if [ -n "$CONTINENT_OVERRIDES" ]; then
     sed -i "s|\[continent-overrides\]|#[continent-overrides]|" "$CONFIG"
     echo >> "$CONFIG"
     echo "[continent-overrides]" >> "$CONFIG"
     for override in $CONTINENT_OVERRIDES; do
-      echo $override >> "$CONFIG"
+      echo "$override" >> "$CONFIG"
     done
     echo >> "$CONFIG"
   fi
 
-  if [ ! -z "$BACKENDS_ALLOWALL" ]; then
+  if [ -n "$BACKENDS_ALLOWALL" ]; then
     sed -i "s|allowall = false|allowall = $BACKENDS_ALLOWALL|" "$CONFIG"
   fi
 
-  if [ ! -z "$BACKENDS_ALLOWALL_SECRET" ]; then
+  if [ -n "$BACKENDS_ALLOWALL_SECRET" ]; then
     sed -i "s|#secret = the-shared-secret-for-allowall|secret = $BACKENDS_ALLOWALL_SECRET|" "$CONFIG"
   fi
 
-  if [ ! -z "$BACKENDS" ]; then
-    BACKENDS_CONFIG=$(echo $BACKENDS | sed 's/ /,/g')
+  if [ -n "$BACKENDS" ]; then
+    BACKENDS_CONFIG=${BACKENDS// /,}
     sed -i "s|#backends = .*|backends = $BACKENDS_CONFIG|" "$CONFIG"
 
     echo >> "$CONFIG"
@@ -237,27 +237,27 @@ if [ ! -f "$CONFIG" ]; then
       echo "[$backend]" >> "$CONFIG"
 
       declare var="BACKEND_${backend^^}_URL"
-      if [ ! -z "${!var}" ]; then
+      if [ -n "${!var}" ]; then
         echo "url = ${!var}" >> "$CONFIG"
       fi
 
       declare var="BACKEND_${backend^^}_SHARED_SECRET"
-      if [ ! -z "${!var}" ]; then
+      if [ -n "${!var}" ]; then
         echo "secret = ${!var}" >> "$CONFIG"
       fi
 
       declare var="BACKEND_${backend^^}_SESSION_LIMIT"
-      if [ ! -z "${!var}" ]; then
+      if [ -n "${!var}" ]; then
         echo "sessionlimit = ${!var}" >> "$CONFIG"
       fi
 
       declare var="BACKEND_${backend^^}_MAX_STREAM_BITRATE"
-      if [ ! -z "${!var}" ]; then
+      if [ -n "${!var}" ]; then
         echo "maxstreambitrate = ${!var}" >> "$CONFIG"
       fi
 
       declare var="BACKEND_${backend^^}_MAX_SCREEN_BITRATE"
-      if [ ! -z "${!var}" ]; then
+      if [ -n "${!var}" ]; then
         echo "maxscreenbitrate = ${!var}" >> "$CONFIG"
       fi
       echo >> "$CONFIG"