Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor(templates): replace "! -z" with "-n" for better readability

Browse Source
This commit is contained in:
emrah
2026-02-12 17:40:45 +03:00
committed by Saúl Ibarra Corretgé
parent 659e2e88f4
commit 0e4bf5ed1a
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
base/rootfs/etc/cont-init.d/01-set-timezone
View File

@@ -1,6 +1,6 @@
#!/usr/bin/with-contenv bash #!/usr/bin/with-contenv bash
if [[ ! -z "$TZ" ]]; then if [[ -n "$TZ" ]]; then
if [[ -f /usr/share/zoneinfo/$TZ ]]; then if [[ -f /usr/share/zoneinfo/$TZ ]]; then
ln -sf /usr/share/zoneinfo/$TZ /etc/localtime ln -sf /usr/share/zoneinfo/$TZ /etc/localtime
echo "$TZ" > /etc/timezone echo "$TZ" > /etc/timezone

2
jibri/rootfs/etc/cont-init.d/10-config
View File

@@ -22,7 +22,7 @@ fi
&& ( echo -e "\e[31mERROR: Please set DISPLAY variable.\e[39m"; kill 1; exit 1 ) && ( echo -e "\e[31mERROR: Please set DISPLAY variable.\e[39m"; kill 1; exit 1 )
# script for finalizing must have executing bit. # 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}" ] \ && [ -f "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \
&& [ ! -x "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \ && [ ! -x "${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}" ] \
&& chmod +x ${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH} && chmod +x ${JIBRI_FINALIZE_RECORDING_SCRIPT_PATH}

2
jvb/rootfs/etc/cont-init.d/10-config
View File

@@ -16,7 +16,7 @@ fi
# Migration from DOCKER_HOST_ADDRESS to JVB_ADVERTISE_IPS # Migration from DOCKER_HOST_ADDRESS to JVB_ADVERTISE_IPS
if [[ -z "${JVB_ADVERTISE_IPS}" ]]; then 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" echo "WARNING: DOCKER_HOST_ADDRESS is deprecated, migrate to JVB_ADVERTISE_IPS"
export JVB_ADVERTISE_IPS=${DOCKER_HOST_ADDRESS} export JVB_ADVERTISE_IPS=${DOCKER_HOST_ADDRESS}
fi fi

8
prosody/rootfs/etc/services.d/70-register-setup/run
View File

@@ -81,7 +81,7 @@ else
fi fi
# Register Jibri user if password is set # 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..." 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) OUTPUT=$(prosodyctl --config $PROSODY_CFG shell user create $JIBRI_XMPP_USER@$XMPP_AUTH_DOMAIN $JIBRI_XMPP_PASSWORD 2>&1)
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@@ -94,7 +94,7 @@ fi
# Register Jibri recorder and Jigasi transcriber in client mode only # Register Jibri recorder and Jigasi transcriber in client mode only
if [[ "$PROSODY_MODE" == "client" ]]; then if [[ "$PROSODY_MODE" == "client" ]]; then
if [[ "$(echo "$ENABLE_RECORDING" | tr '[:upper:]' '[:lower:]')" == "true" ]] || [[ "$ENABLE_RECORDING" == "1" ]]; 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..." 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) OUTPUT=$(prosodyctl --config $PROSODY_CFG shell user create $JIBRI_RECORDER_USER@$XMPP_HIDDEN_DOMAIN $JIBRI_RECORDER_PASSWORD 2>&1)
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
@@ -106,7 +106,7 @@ if [[ "$PROSODY_MODE" == "client" ]]; then
fi fi
if [[ "$(echo "$ENABLE_TRANSCRIPTIONS" | tr '[:upper:]' '[:lower:]')" == "true" ]] || [[ "$ENABLE_TRANSCRIPTIONS" == "1" ]]; then 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" [ -z "$JIGASI_TRANSCRIBER_USER" ] && JIGASI_TRANSCRIBER_USER="transcriber"
echo "[register-setup] Registering Jigasi transcriber user..." 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) 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 fi
# Register Jigasi user if password is set # 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..." 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) OUTPUT=$(prosodyctl --config $PROSODY_CFG shell user create $JIGASI_XMPP_USER@$XMPP_AUTH_DOMAIN $JIGASI_XMPP_PASSWORD 2>&1)
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then

2
release.sh
View File

@@ -10,7 +10,7 @@ set -e
# Don't start a release if the tree is dirty # 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!" echo "Git tree is not clean, aborting release!"
exit 1 exit 1
fi fi

2
web/rootfs/etc/cont-init.d/10-config
View File

@@ -21,7 +21,7 @@ if [[ $DISABLE_HTTPS -ne 1 ]]; then
fi fi
ACME_SERVER="" ACME_SERVER=""
if [[ ! -z $LETSENCRYPT_ACME_SERVER ]]; then if [[ -n $LETSENCRYPT_ACME_SERVER ]]; then
ACME_SERVER="--set-default-ca --server $LETSENCRYPT_ACME_SERVER" ACME_SERVER="--set-default-ca --server $LETSENCRYPT_ACME_SERVER"
echo "Using custom ACME server: $LETSENCRYPT_ACME_SERVER" echo "Using custom ACME server: $LETSENCRYPT_ACME_SERVER"
fi fi

2
web/rootfs/etc/services.d/jaas-account/run
View File

@@ -17,7 +17,7 @@ function stop_service() {
exit 0 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 if [ -f $JAAS_ACCOUNT_FILE ]; then
echo "JaaS account already exists" echo "JaaS account already exists"