add-jibri-node.sh

@@ -70,8 +70,8 @@ var_dlim() {
 }
 
 check_var() {
-	if [ -z "$2" ]; then
+    if [ "$2" = "TBD" ]; then
-		echo -e "Check if variable $1 is set: \xE2\x9C\x96 \nExiting..."
+        echo -e "Check if variable $1 is set: \xE2\x9C\x96"
         exit
     else
         echo -e "Check if variable $1 is set: \xE2\x9C\x94"
@@ -87,6 +87,48 @@ else
     ADDUP=$((LAST + 1))
 fi
 
+echo "
+#-----------------------------------------------------------------------
+# Checking initial necessary variables...
+#-----------------------------------------------------------------------"
+
+JMS_DATA=($MAIN_SRV_DIST \
+          $MAIN_SRV_REPO \
+          $MAIN_SRV_DOMAIN \
+          $JibriBrewery \
+          $JB_NAME \
+          $JB_AUTH_PASS \
+          $JB_REC_PASS \
+          $MJS_USER \
+          $MJS_USER_PASS)
+
+JMS_EVAL=${JMS_DATA[0]}
+for i in "${JMS_DATA[@]}"; do
+    if [[ "$JMS_EVAL" != "$i" ]]; then
+        ALL_TBD="no"
+        break
+    fi
+done
+if [ "$ALL_TBD" = "no" ];then
+ echo -e "Good, seems this is not a vanilla copy of add-jibri-node.sh,
+let's check variables ...\n"
+else
+ echo -e "You seem to be using a vanilla copy of the add-jibri-node.sh.
+  > Please use the content (or apply the changes) of add-jibri-node.sh from
+    the main Jitsi server installation folder, as it contains necessary data.\n"
+        exit
+fi
+
+check_var MAIN_SRV_DIST "$MAIN_SRV_DIST"
+check_var MAIN_SRV_REPO "$MAIN_SRV_REPO"
+check_var MAIN_SRV_DOMAIN "$MAIN_SRV_DOMAIN"
+check_var JibriBrewery "$JibriBrewery"
+check_var JB_NAME "$JB_NAME"
+check_var JB_AUTH_PASS "$JB_AUTH_PASS"
+check_var JB_REC_PASS "$JB_REC_PASS"
+check_var MJS_USER "$MJS_USER"
+check_var MJS_USER_PASS "$MJS_USER_PASS"
+
 #Check server and node OS
 if [ ! "$THIS_SRV_DIST" = "$MAIN_SRV_DIST" ]; then
     echo "Please use the same OS for the jibri setup on both servers."
@@ -140,21 +182,6 @@ else
     done
 fi
 
-echo "
-#-----------------------------------------------------------------------
-# Checking initial necessary variables...
-#-----------------------------------------------------------------------"
-
-check_var MAIN_SRV_DIST "$MAIN_SRV_DIST"
-check_var MAIN_SRV_REPO "$MAIN_SRV_REPO"
-check_var MAIN_SRV_DOMAIN "$MAIN_SRV_DOMAIN"
-check_var JibriBrewery "$JibriBrewery"
-check_var JB_NAME "$JB_NAME"
-check_var JB_AUTH_PASS "$JB_AUTH_PASS"
-check_var JB_REC_PASS "$JB_REC_PASS"
-check_var MJS_USER "$MJS_USER"
-check_var MJS_USER_PASS "$MJS_USER_PASS"
-
 # Rename hostname for each jibri node
 hostnamectl set-hostname "jbnode${ADDUP}.${MAIN_SRV_DOMAIN}"
 sed -i "1i 127.0.0.1 jbnode${ADDUP}.${MAIN_SRV_DOMAIN}" /etc/hosts