From 869df7ceef29892ccc082848080a3c5ae434d592 Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Mon, 23 May 2022 23:17:39 -0500 Subject: [PATCH] 7.0.1 (#81) * Fix debug mode on triggered scripts. * Fix grep condition. --- jitsi-updater.sh | 6 +++++- jm-bm.sh | 2 +- quick_jibri_installer.sh | 12 ++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/jitsi-updater.sh b/jitsi-updater.sh index faefc4a..7b4196f 100644 --- a/jitsi-updater.sh +++ b/jitsi-updater.sh @@ -207,6 +207,10 @@ restart_services # Brandless mode # ######################################################################## if [ "$ENABLE_BLESSM" = "on" ]; then - bash "$PWD"/jm-bm.sh + if [ "$MODE" = "debug" ]; then + bash "$PWD"/jm-bm.sh -m debug + else + bash "$PWD"/jm-bm.sh + fi fi printwc "${Blue}" "Script completed \o/!\n" diff --git a/jm-bm.sh b/jm-bm.sh index d5bc4dc..39a6dca 100644 --- a/jm-bm.sh +++ b/jm-bm.sh @@ -67,7 +67,7 @@ sed -i "s|jitsilogo.png|watermark2.png|g" "$TITLE_FILE" sed -i "s|logo-deep-linking.png|watermark2.png|g" "$BUNDLE_JS" sed -i "s|jitsiLogo_square.png|gnome_record.png|g" "$BUNDLE_JS" #Disable logo and url -if ! grep -nr ".leftwatermark{display:none" "$CSS_FILE" ; then +if ! grep -q ".leftwatermark{display:none" "$CSS_FILE" ; then sed -i "s|.leftwatermark{|.leftwatermark{display:none;|" "$CSS_FILE" fi diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh index 0aff27c..da32c76 100644 --- a/quick_jibri_installer.sh +++ b/quick_jibri_installer.sh @@ -1092,7 +1092,11 @@ sleep .1 ###JWT if [ "$ENABLE_JWT" = "yes" ]; then printf "\nJWT auth is being setup...\n" - bash "$PWD"/mode/jwt.sh + if [ "$MODE" = "debug" ]; then + bash "$PWD"/mode/jwt.sh -m debug + else + bash "$PWD"/mode/jwt.sh + fi fi sleep .1 #Guest allow @@ -1201,7 +1205,11 @@ fi if [ "$ENABLE_BLESSM" = "yes" ]; then echo "Custom brandless mode will be enabled." sed -i "s|ENABLE_BLESSM=.*|ENABLE_BLESSM=\"on\"|" jitsi-updater.sh - bash "$PWD"/jm-bm.sh + if [ "$MODE" = "debug" ]; then + bash "$PWD"/jm-bm.sh -m debug + else + bash "$PWD"/jm-bm.sh + fi fi # Applying best practives for interface config.js