library.sh: Don't use {release}-security package source if not available in sources.list

This commit is contained in:
thecalcaholic 2022-07-29 00:50:42 +02:00 committed by Tobias K
parent 611fd7a357
commit 5bf6505ac5
2 changed files with 2 additions and 2 deletions

View File

@ -70,7 +70,7 @@ apt-get dist-upgrade -y
# install latest PHP version
release_new=$(jq -r '.release' < "${new_cfg}")
# the default repo in bullseye is bullseye-security - use bullseye if it is not available
grep -v '#' /etc/apt/sources.list | grep 'bullseye-security' > /dev/null && release_new="${release_new}-security"
grep -Eh '^deb ' /etc/apt/sources.list | grep 'bullseye-security' > /dev/null && release_new="${release_new}-security"
php_ver_new=$(jq -r '.php_version' < "${new_cfg}")
$APTINSTALL -t ${release_new} php${php_ver_new} php${php_ver_new}-curl php${php_ver_new}-gd php${php_ver_new}-fpm php${php_ver_new}-cli php${php_ver_new}-opcache \

View File

@ -51,7 +51,7 @@ NCLATESTVER=$(jq -r .nextcloud_version < "$NCPCFG")
PHPVER=$( jq -r .php_version < "$NCPCFG")
RELEASE=$( jq -r .release < "$NCPCFG")
# the default repo in bullseye is bullseye-security
RELEASE="${RELEASE}-security"
grep -Eh '^deb ' /etc/apt/sources.list | grep "${RELEASE}-security" && RELEASE="${RELEASE}-security"
command -v ncc &>/dev/null && NCVER="$(ncc status 2>/dev/null | grep "version:" | awk '{ print $3 }')"
function configure_app()