From 9ff21bb3fb365738da7c4adeddd9dd02e2039939 Mon Sep 17 00:00:00 2001 From: nachoparker Date: Sat, 23 Oct 2021 09:35:39 -0600 Subject: nc-backup-auto: ncc path Signed-off-by: nachoparker --- changelog.md | 4 +++- etc/library.sh | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/changelog.md b/changelog.md index 1f36a9ab..bb58c950 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v1.42.1](https://github.com/nextcloud/nextcloudpi/commit/945716f) (2021-10-22) ncp-web: fix log download bug +[v1.42.2](https://github.com/nextcloud/nextcloudpi/commit/749d252) (2021-10-23) nc-backup-auto: ncc path + +[v1.42.1](https://github.com/nextcloud/nextcloudpi/commit/e11ce59) (2021-10-22) ncp-web: fix log download bug [v1.42.0 ](https://github.com/nextcloud/nextcloudpi/commit/3f57513) (2021-10-21) ncp-web: add Russion translations diff --git a/etc/library.sh b/etc/library.sh index 28867633..914d66c4 100644 --- a/etc/library.sh +++ b/etc/library.sh @@ -12,6 +12,7 @@ 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 TRUSTED_DOMAINS=( [ip]=1 [dnsmasq]=2 [nc_domain]=3 [nextcloudpi-local]=5 [docker_overwrite]=6 @@ -466,16 +467,16 @@ function notify_admin() function save_maintenance_mode() { unset NCP_MAINTENANCE_MODE - grep -q enabled <(ncc maintenance:mode) && export NCP_MAINTENANCE_MODE="on" || true - ncc maintenance:mode --on + grep -q enabled <("${ncc}" maintenance:mode) && export NCP_MAINTENANCE_MODE="on" || true + "${ncc}" maintenance:mode --on } function restore_maintenance_mode() { if [[ "${NCP_MAINTENANCE_MODE}" != "" ]]; then - ncc maintenance:mode --on + "${ncc}" maintenance:mode --on else - ncc maintenance:mode --off + "${ncc}" maintenance:mode --off fi } -- cgit v1.2.3