From ab3a7c2621c7d0dffb5eca25f94379cec4bce886 Mon Sep 17 00:00:00 2001 From: emrah Date: Thu, 12 Feb 2026 19:30:21 +0300 Subject: [PATCH] refactor(templates): wrap shell variables in conditions with double quotes --- jibri/rootfs/etc/cont-init.d/10-config | 2 +- jicofo/rootfs/etc/cont-init.d/10-config | 2 +- jigasi/rootfs/etc/cont-init.d/10-config | 4 ++-- jvb/rootfs/etc/cont-init.d/10-config | 4 ++-- prosody/rootfs/etc/cont-init.d/10-config | 4 ++-- prosody/rootfs/etc/services.d/70-register-setup/run | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jibri/rootfs/etc/cont-init.d/10-config b/jibri/rootfs/etc/cont-init.d/10-config index 55a65d0..4cdba85 100644 --- a/jibri/rootfs/etc/cont-init.d/10-config +++ b/jibri/rootfs/etc/cont-init.d/10-config @@ -12,7 +12,7 @@ if ! shm-check; then exit 1 fi -if [[ -z $JIBRI_RECORDER_PASSWORD || -z $JIBRI_XMPP_PASSWORD ]]; then +if [[ -z "$JIBRI_RECORDER_PASSWORD" || -z "$JIBRI_XMPP_PASSWORD" ]]; then echo 'FATAL ERROR: Jibri recorder password and auth password must be set' exit 1 fi diff --git a/jicofo/rootfs/etc/cont-init.d/10-config b/jicofo/rootfs/etc/cont-init.d/10-config index c7b2c9a..63d10a7 100644 --- a/jicofo/rootfs/etc/cont-init.d/10-config +++ b/jicofo/rootfs/etc/cont-init.d/10-config @@ -2,7 +2,7 @@ export SENTRY_RELEASE="${SENTRY_RELEASE:-$(apt-cache policy jicofo | sed -n '/Installed/p' | sed -e 's/[^:]*: //')}" -if [[ -z $JICOFO_AUTH_PASSWORD ]]; then +if [[ -z "$JICOFO_AUTH_PASSWORD" ]]; then echo 'FATAL ERROR: Jicofo auth password must be set' exit 1 fi diff --git a/jigasi/rootfs/etc/cont-init.d/10-config b/jigasi/rootfs/etc/cont-init.d/10-config index 2325a1c..ef28423 100644 --- a/jigasi/rootfs/etc/cont-init.d/10-config +++ b/jigasi/rootfs/etc/cont-init.d/10-config @@ -2,7 +2,7 @@ export SENTRY_RELEASE="${SENTRY_RELEASE:-$(apt-cache policy jigasi | sed -n '/Installed/p' | sed -e 's/[^:]*: //')}" -if [[ -z $JIGASI_XMPP_PASSWORD ]]; then +if [[ -z "$JIGASI_XMPP_PASSWORD" ]]; then echo 'FATAL ERROR: Jigasi auth password must be set' exit 1 fi @@ -65,7 +65,7 @@ elif [[ "$JIGASI_MODE" == "transcriber" ]]; then chown jigasi:jitsi /tmp/transcripts # Create Google Cloud Credentials - if [[ -z $GC_PROJECT_ID || -z $GC_PRIVATE_KEY_ID || -z $GC_PRIVATE_KEY || -z $GC_CLIENT_EMAIL || -z $GC_CLIENT_ID || -z $GC_CLIENT_CERT_URL ]]; then + if [[ -z "$GC_PROJECT_ID" || -z "$GC_PRIVATE_KEY_ID" || -z "$GC_PRIVATE_KEY" || -z "$GC_CLIENT_EMAIL" || -z "$GC_CLIENT_ID" || -z "$GC_CLIENT_CERT_URL" ]]; then echo 'Transcriptions: One or more gcloud environment variables are undefined, skipping gcloud credentials file /config/key.json' else jq -n \ diff --git a/jvb/rootfs/etc/cont-init.d/10-config b/jvb/rootfs/etc/cont-init.d/10-config index b8416f5..05294b9 100644 --- a/jvb/rootfs/etc/cont-init.d/10-config +++ b/jvb/rootfs/etc/cont-init.d/10-config @@ -1,7 +1,7 @@ #!/usr/bin/with-contenv bash -if [[ -z $JVB_DISABLE_XMPP ]]; then - if [[ -z $JVB_AUTH_PASSWORD ]]; then +if [[ -z "$JVB_DISABLE_XMPP" ]]; then + if [[ -z "$JVB_AUTH_PASSWORD" ]]; then echo 'FATAL ERROR: JVB auth password must be set' exit 1 fi diff --git a/prosody/rootfs/etc/cont-init.d/10-config b/prosody/rootfs/etc/cont-init.d/10-config index f29424a..7620ddf 100644 --- a/prosody/rootfs/etc/cont-init.d/10-config +++ b/prosody/rootfs/etc/cont-init.d/10-config @@ -65,7 +65,7 @@ fi tpl /defaults/prosody.cfg.lua > $PROSODY_CFG tpl /defaults/conf.d/$PROSODY_SITE_CFG > /config/conf.d/$PROSODY_SITE_CFG -if [[ -z $JICOFO_AUTH_PASSWORD ]]; then +if [[ -z "$JICOFO_AUTH_PASSWORD" ]]; then echo 'FATAL ERROR: Jicofo auth password must be set' exit 1 fi @@ -83,7 +83,7 @@ fi # User registration is now handled by the 70-register-setup service after prosody starts -if [[ -z $JVB_AUTH_PASSWORD ]]; then +if [[ -z "$JVB_AUTH_PASSWORD" ]]; then echo 'FATAL ERROR: JVB auth password must be set' exit 1 fi diff --git a/prosody/rootfs/etc/services.d/70-register-setup/run b/prosody/rootfs/etc/services.d/70-register-setup/run index 3d70da7..ac8e73a 100755 --- a/prosody/rootfs/etc/services.d/70-register-setup/run +++ b/prosody/rootfs/etc/services.d/70-register-setup/run @@ -52,12 +52,12 @@ fi PROSODY_CFG="/config/prosody.cfg.lua" # Validate required passwords -if [[ -z $JICOFO_AUTH_PASSWORD ]]; then +if [[ -z "$JICOFO_AUTH_PASSWORD" ]]; then echo '[register-setup] FATAL ERROR: Jicofo auth password must be set' exit 1 fi -if [[ -z $JVB_AUTH_PASSWORD ]]; then +if [[ -z "$JVB_AUTH_PASSWORD" ]]; then echo '[register-setup] FATAL ERROR: JVB auth password must be set' exit 1 fi