diff options
Diffstat (limited to 'etc/library.sh')
| -rw-r--r-- | etc/library.sh | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/etc/library.sh b/etc/library.sh index 35787806..1d083814 100644 --- a/etc/library.sh +++ b/etc/library.sh @@ -8,11 +8,14 @@ # More at ownyourbits.com # -export NCPCFG=${NCPCFG:-/usr/local/etc/ncp.cfg} export CFGDIR=/usr/local/etc/ncp-config.d export BINDIR=/usr/local/bin/ncp export NCDIR=/var/www/nextcloud export ncc=/usr/local/bin/ncc +export NCPCFG=${NCPCFG:-etc/ncp.cfg} + +[[ -f "$NCPCFG" ]] || export NCPCFG=/usr/local/etc/ncp.cfg +[[ -f "$NCPCFG" ]] || { echo "$NCPCFG not found" >2; exit 1; } #unset TRUSTED_DOMAINS #declare -A TRUSTED_DOMAINS @@ -27,11 +30,11 @@ command -v jq &>/dev/null || { apt-get install -y --no-install-recommends jq } -[[ -f "$NCPCFG" ]] && { - NCLATESTVER=$(jq -r .nextcloud_version < "$NCPCFG") - PHPVER=$( jq -r .php_version < "$NCPCFG") - RELEASE=$( jq -r .release < "$NCPCFG") -} +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" command -v ncc &>/dev/null && NCVER="$(ncc status 2>/dev/null | grep "version:" | awk '{ print $3 }')" function configure_app() |