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 6 additions and 3 deletions
Showing only changes of commit 0f39230327 - Show all commits

View File

@ -22,12 +22,13 @@ if ! [ $(id -u) = 0 ]; then
fi fi
clear clear
echo ' echo -e '\n
######################################################################## ########################################################################
Jibri Recordings Access via Nextcloud Jibri Recordings Access via Nextcloud
######################################################################## ########################################################################
by Software, IT & Networks Ltd by Software, IT & Networks Ltd
' \n'
while [[ -z "$NC_DOMAIN" ]] while [[ -z "$NC_DOMAIN" ]]
do do
read -p "Please enter the domain to use for Nextcloud: " -r NC_DOMAIN read -p "Please enter the domain to use for Nextcloud: " -r NC_DOMAIN

View File

@ -32,7 +32,9 @@ fi
echo "Checking for updates...." echo "Checking for updates...."
apt -q2 update apt -q2 update
apt install -y apt-show-versions jq apt install -y \
apt-show-versions \
jq
echo -e "\n# Check for jibri\n" echo -e "\n# Check for jibri\n"
if [ "$(dpkg-query -W -f='${Status}' jibri 2>/dev/null | grep -c "ok installed")" == "1" ]; then if [ "$(dpkg-query -W -f='${Status}' jibri 2>/dev/null | grep -c "ok installed")" == "1" ]; then