Merge and track latest features on stable #6

Merged
Ark74 merged 71 commits from unstable into master 2020-08-08 06:41:50 +00:00
1 changed files with 5 additions and 5 deletions
Showing only changes of commit 556aa12f47 - Show all commits

View File

@ -144,8 +144,8 @@ fi
#Check resources #Check resources
echo "Verifying System Resources:" echo "Verifying System Resources:"
if [ "$(nproc --all)" -lt 4 ];then if [ "$(nproc --all)" -lt 4 ];then
echo "Warning: The system do not meet the minimum requirements for Jibri to run." echo "Warning!: The system do not meet the minimum requirements for Jibri to run."
echo "Warning: We recommend 4 cores/threads for Jibri!" echo ">> We recommend 4 cores/threads for Jibri!"
CPU_MIN="N" CPU_MIN="N"
else else
echo "CPU Cores/Threads: OK ($(nproc --all))" echo "CPU Cores/Threads: OK ($(nproc --all))"
@ -154,8 +154,8 @@ fi
### Test RAM size (8GB min) ### ### Test RAM size (8GB min) ###
mem_available=$(grep MemTotal /proc/meminfo| grep -o '[0-9]\+') mem_available=$(grep MemTotal /proc/meminfo| grep -o '[0-9]\+')
if [ ${mem_available} -lt 7700000 ]; then if [ ${mem_available} -lt 7700000 ]; then
echo "Warning: The system do not meet the minimum requirements for Jibri to run." echo "Warning!: The system do not meet the minimum requirements for Jibri to run."
echo "Warning: We recommend 8GB RAM for Jibri!" echo ">> We recommend 8GB RAM for Jibri!"
MEM_MIN="N" MEM_MIN="N"
else else
echo "Memory: OK ($((mem_available/1024)) MiB)" echo "Memory: OK ($((mem_available/1024)) MiB)"
@ -165,7 +165,7 @@ if [ "$CPU_MIN" = "Y" ] && [ "$MEM_MIN" = "Y" ];then
echo "All requirements seems meet!" echo "All requirements seems meet!"
echo "We hope you have a nice recording/streaming session" echo "We hope you have a nice recording/streaming session"
else else
echo "Seems CPU/RAM requirements are NOT meet!" echo "CPU ($(nproc --all))/RAM ($((mem_available/1024)) MiB) does NOT meet minimum recommended requirements!"
echo "Even when you can use the videconference sessions, we advice to increase the resoruces in order to user Jibri." echo "Even when you can use the videconference sessions, we advice to increase the resoruces in order to user Jibri."
while [[ "$CONTINUE_LOW_RES" != "yes" && "$CONTINUE_LOW_RES" != "no" ]] while [[ "$CONTINUE_LOW_RES" != "yes" && "$CONTINUE_LOW_RES" != "no" ]]
do do