From 3dc0e2b4aa5eabfdb27a2c207f2a66ed133b5f04 Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Tue, 6 Oct 2020 22:29:13 -0500
Subject: [PATCH] Rearrange check function and 'test-jibri-env.sh' to main
 installer

---
 quick_jibri_installer.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/quick_jibri_installer.sh b/quick_jibri_installer.sh
index 2fc5f18..f23651b 100644
--- a/quick_jibri_installer.sh
+++ b/quick_jibri_installer.sh
@@ -62,8 +62,9 @@ Installing nginx webserver!
 fi
 }
 check_snd_driver() {
+# ALSA - Loopback
+echo "snd-aloop" | tee -a /etc/modules
 modprobe snd-aloop
-echo "snd-aloop" >> /etc/modules
 if [ "$(lsmod | grep snd_aloop | head -n 1 | cut -d " " -f1)" = "snd_aloop" ]; then
 	echo "
 #-----------------------------------------------------------------------
@@ -72,11 +73,16 @@ if [ "$(lsmod | grep snd_aloop | head -n 1 | cut -d " " -f1)" = "snd_aloop" ]; t
 else
 	echo "
 #-----------------------------------------------------------------------
-# Your audio driver might not be able to load, once the installation
-# is complete and server restarted, please run: \`lsmod | grep snd_aloop'
-# to make sure it did. If not, any feedback for your setup is welcome.
+# Your audio driver might not be able to load.
+# We'll check the state of this Jibri with our 'test-jibri-env.sh' tool.
 #-----------------------------------------------------------------------"
 read -n 1 -s -r -p "Press any key to continue..."$'\n'
+#Test tool
+  if [ "$MODE" = "debug" ]; then
+    bash $PWD/tools/test-jibri-env.sh -m debug
+  else
+    bash $PWD/tools/test-jibri-env.sh
+  fi
 fi
 }
 # sed limiters for add-jibri-node.sh variables
@@ -283,9 +289,6 @@ elif [ "$(npm list -g esprima 2>/dev/null | grep -c "esprima")" == "1" ]; then
 	echo "Good. Esprima package is already installed"
 fi
 
-# ALSA - Loopback
-echo "snd-aloop" | tee -a /etc/modules
-check_snd_driver
 CHD_VER=$(curl -sL https://chromedriver.storage.googleapis.com/LATEST_RELEASE)
 GCMP_JSON="/etc/opt/chrome/policies/managed/managed_policies.json"
 
@@ -1041,6 +1044,8 @@ else
   echo "Local host already in place..."
 fi
 
+check_snd_driver
+
 echo "
 ########################################################################
                     Installation complete!!