Rearrange check function and 'test-jibri-env.sh' to main installer

This commit is contained in:
Luis Guzmán 2020-10-06 22:29:13 -05:00
parent 10eb4ff83d
commit 3dc0e2b4aa
1 changed files with 12 additions and 7 deletions

View File

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