4.0 release merge #16

Merged
Ark74 merged 54 commits from unstable into master 2020-10-11 07:30:47 +00:00
2 changed files with 3 additions and 5 deletions
Showing only changes of commit 5c2f0576c8 - Show all commits

View File

@ -206,10 +206,7 @@ else
# Your audio driver might not be able to load. # Your audio driver might not be able to load.
# We'll check the state of this Jibri with our 'test-jibri-env.sh' tool. # 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' curl -s $TEST_JIBRI_ENV > /tmp/test-jibri-env.sh
curl -s \
$TEST_JIBRI_ENV \
> /tmp/test-jibri-env.sh
#Test tool #Test tool
if [ "$MODE" = "debug" ]; then if [ "$MODE" = "debug" ]; then
bash /tmp/test-jibri-env.sh -m debug bash /tmp/test-jibri-env.sh -m debug
@ -217,6 +214,7 @@ $TEST_JIBRI_ENV \
bash /tmp/test-jibri-env.sh bash /tmp/test-jibri-env.sh
fi fi
rm /tmp/test-jibri-env.sh rm /tmp/test-jibri-env.sh
read -n 1 -s -r -p "Press any key to continue..."$'\n'
fi fi
} }

View File

@ -76,13 +76,13 @@ else
# Your audio driver might not be able to load. # Your audio driver might not be able to load.
# We'll check the state of this Jibri with our 'test-jibri-env.sh' tool. # 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 #Test tool
if [ "$MODE" = "debug" ]; then if [ "$MODE" = "debug" ]; then
bash $PWD/tools/test-jibri-env.sh -m debug bash $PWD/tools/test-jibri-env.sh -m debug
else else
bash $PWD/tools/test-jibri-env.sh bash $PWD/tools/test-jibri-env.sh
fi fi
read -n 1 -s -r -p "Press any key to continue..."$'\n'
fi fi
} }
# sed limiters for add-jibri-node.sh variables # sed limiters for add-jibri-node.sh variables