From 0e4bf5ed1ab0b87866366f9627b28048009b4569 Mon Sep 17 00:00:00 2001 From: emrah Date: Thu, 12 Feb 2026 17:40:45 +0300 Subject: [PATCH] refactor(templates): replace "! -z" with "-n" for better readability --- base/rootfs/etc/cont-init.d/01-set-timezone | 2 +- jibri/rootfs/etc/cont-init.d/10-config | 2 +- jvb/rootfs/etc/cont-init.d/10-config | 2 +- prosody/rootfs/etc/services.d/70-register-setup/run | 8 ++++---- release.sh | 2 +- web/rootfs/etc/cont-init.d/10-config | 2 +- web/rootfs/etc/services.d/jaas-account/run | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/base/rootfs/etc/cont-init.d/01-set-timezone b/base/rootfs/etc/cont-init.d/01-set-timezone index 71e6dec..7964694 100644 --- a/base/rootfs/etc/cont-init.d/01-set-timezone +++ b/base/rootfs/etc/cont-init.d/01-set-timezone @@ -1,6 +1,6 @@ #!/usr/bin/with-contenv bash -if [[ ! -z "$TZ" ]]; then +if [[ -n "$TZ" ]]; then if [[ -f /usr/share/zoneinfo/$TZ ]]; then ln -sf /usr/share/zoneinfo/$TZ /etc/localtime echo "$TZ" > /etc/timezone diff --git a/jibri/rootfs/etc/cont-init.d/10-config b/jibri/rootfs/etc/cont-init.d/10-config index 65dc2d0..55a65d0 100644 --- a/jibri/rootfs/etc/cont-init.d/10-config +++ b/jibri/rootfs/etc/cont-init.d/10-config @@ -22,7 +22,7 @@ fi && ( echo -e "\e[31mERROR: Please set DISPLAY variable.\e[39m"; kill 1; exit 1 ) # script for finalizing must have executing bit. -[ ! -z "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \ +[ -n "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \ && [ -f "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \ && [ ! -x "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \ && chmod +x ${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH} diff --git a/jvb/rootfs/etc/cont-init.d/10-config b/jvb/rootfs/etc/cont-init.d/10-config index 8eb2143..157288d 100644 --- a/jvb/rootfs/etc/cont-init.d/10-config +++ b/jvb/rootfs/etc/cont-init.d/10-config @@ -16,7 +16,7 @@ fi # Migration from DOCKER_HOST_ADDRESS to JVB_ADVERTISE_IPS if [[ -z "${JVB_ADVERTISE_IPS}" ]]; then - if [[ ! -z "${DOCKER_HOST_ADDRESS}" ]]; then + if [[ -n "${DOCKER_HOST_ADDRESS}" ]]; then echo "WARNING: DOCKER_HOST_ADDRESS is deprecated, migrate to JVB_ADVERTISE_IPS" export JVB_ADVERTISE_IPS=${DOCKER_HOST_ADDRESS} fi diff --git a/prosody/rootfs/etc/services.d/70-register-setup/run b/prosody/rootfs/etc/services.d/70-register-setup/run index 7677207..92041c0 100755 --- a/prosody/rootfs/etc/services.d/70-register-setup/run +++ b/prosody/rootfs/etc/services.d/70-register-setup/run @@ -81,7 +81,7 @@ else fi # Register Jibri user if password is set -if [[ ! -z $JIBRI_XMPP_PASSWORD ]]; then +if [[ -n $JIBRI_XMPP_PASSWORD ]]; then echo "[register-setup] Registering Jibri user..." OUTPUT=$(prosodyctl --config $PROSODY_CFG shell user create $JIBRI_XMPP_USER@$XMPP_AUTH_DOMAIN $JIBRI_XMPP_PASSWORD 2>&1) if [ $? -eq 0 ]; then @@ -94,7 +94,7 @@ fi # Register Jibri recorder and Jigasi transcriber in client mode only if [[ "$PROSODY_MODE" == "client" ]]; then if [[ "$(echo "$ENABLE_RECORDING" | tr '[:upper:]' '[:lower:]')" == "true" ]] || [[ "$ENABLE_RECORDING" == "1" ]]; then - if [[ ! -z $JIBRI_RECORDER_PASSWORD ]]; then + if [[ -n $JIBRI_RECORDER_PASSWORD ]]; then echo "[register-setup] Registering Jibri recorder user..." OUTPUT=$(prosodyctl --config $PROSODY_CFG shell user create $JIBRI_RECORDER_USER@$XMPP_HIDDEN_DOMAIN $JIBRI_RECORDER_PASSWORD 2>&1) if [ $? -eq 0 ]; then @@ -106,7 +106,7 @@ if [[ "$PROSODY_MODE" == "client" ]]; then fi if [[ "$(echo "$ENABLE_TRANSCRIPTIONS" | tr '[:upper:]' '[:lower:]')" == "true" ]] || [[ "$ENABLE_TRANSCRIPTIONS" == "1" ]]; then - if [[ ! -z $JIGASI_TRANSCRIBER_PASSWORD ]]; then + if [[ -n $JIGASI_TRANSCRIBER_PASSWORD ]]; then [ -z "$JIGASI_TRANSCRIBER_USER" ] && JIGASI_TRANSCRIBER_USER="transcriber" echo "[register-setup] Registering Jigasi transcriber user..." OUTPUT=$(prosodyctl --config $PROSODY_CFG shell user create $JIGASI_TRANSCRIBER_USER@$XMPP_HIDDEN_DOMAIN $JIGASI_TRANSCRIBER_PASSWORD 2>&1) @@ -120,7 +120,7 @@ if [[ "$PROSODY_MODE" == "client" ]]; then fi # Register Jigasi user if password is set -if [[ ! -z $JIGASI_XMPP_PASSWORD ]]; then +if [[ -n $JIGASI_XMPP_PASSWORD ]]; then echo "[register-setup] Registering Jigasi user..." OUTPUT=$(prosodyctl --config $PROSODY_CFG shell user create $JIGASI_XMPP_USER@$XMPP_AUTH_DOMAIN $JIGASI_XMPP_PASSWORD 2>&1) if [ $? -eq 0 ]; then diff --git a/release.sh b/release.sh index 84827a4..e656c2c 100755 --- a/release.sh +++ b/release.sh @@ -10,7 +10,7 @@ set -e # Don't start a release if the tree is dirty # -if [[ ! -z $(git status -s) ]]; then +if [[ -n $(git status -s) ]]; then echo "Git tree is not clean, aborting release!" exit 1 fi diff --git a/web/rootfs/etc/cont-init.d/10-config b/web/rootfs/etc/cont-init.d/10-config index 631cc64..35b4bf6 100644 --- a/web/rootfs/etc/cont-init.d/10-config +++ b/web/rootfs/etc/cont-init.d/10-config @@ -21,7 +21,7 @@ if [[ $DISABLE_HTTPS -ne 1 ]]; then fi ACME_SERVER="" - if [[ ! -z $LETSENCRYPT_ACME_SERVER ]]; then + if [[ -n $LETSENCRYPT_ACME_SERVER ]]; then ACME_SERVER="--set-default-ca --server $LETSENCRYPT_ACME_SERVER" echo "Using custom ACME server: $LETSENCRYPT_ACME_SERVER" fi diff --git a/web/rootfs/etc/services.d/jaas-account/run b/web/rootfs/etc/services.d/jaas-account/run index dcb85cc..ac0f885 100644 --- a/web/rootfs/etc/services.d/jaas-account/run +++ b/web/rootfs/etc/services.d/jaas-account/run @@ -17,7 +17,7 @@ function stop_service() { exit 0 } -if [[ $DISABLE_HTTPS -ne 1 ]] && [[ $ENABLE_LETSENCRYPT -eq 1 ]] && [[ $ENABLE_JAAS_COMPONENTS -eq 1 ]] && [[ ! -z $EMAIL ]] && [[ ! -z $DOMAIN ]]; then +if [[ $DISABLE_HTTPS -ne 1 ]] && [[ $ENABLE_LETSENCRYPT -eq 1 ]] && [[ $ENABLE_JAAS_COMPONENTS -eq 1 ]] && [[ -n $EMAIL ]] && [[ -n $DOMAIN ]]; then if [ -f $JAAS_ACCOUNT_FILE ]; then echo "JaaS account already exists" @@ -119,4 +119,4 @@ done) rm ${CHALLENGE_FILE} || true fi -stop_service \ No newline at end of file +stop_service