From 72d2d00f747e3297f8d0525550a9d5290f41414d Mon Sep 17 00:00:00 2001 From: nachoparker Date: Sat, 30 Nov 2019 08:42:40 -0700 Subject: [PATCH] upgrade to NC17.0.1 Signed-off-by: nachoparker --- README.md | 2 +- bin/ncp/CONFIG/nc-init.sh | 8 +++++--- changelog.md | 4 +++- etc/logo | Bin 77792 -> 18694 bytes etc/ncp-config.d/nc-nextcloud.cfg | 2 +- etc/ncp.cfg | 2 +- updates/1.19.0.sh | 10 ++++++++++ 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 435326bc..58a267e3 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Find the full documentation at [docs.nextcloudpi.com](http://docs.nextcloudpi.co ## Features * Debian/Raspbian 10 Buster - * Nextcloud 16.0.5 + * Nextcloud 17.0.1 * Apache 2.4.25, with HTTP2 enabled * PHP 7.3 * MariaDB 10 diff --git a/bin/ncp/CONFIG/nc-init.sh b/bin/ncp/CONFIG/nc-init.sh index b81c39e2..f1bddc49 100644 --- a/bin/ncp/CONFIG/nc-init.sh +++ b/bin/ncp/CONFIG/nc-init.sh @@ -26,11 +26,11 @@ configure() # launch mariadb if not already running if ! pgrep -c mysqld &>/dev/null; then - mysqld & + mysqld & fi # wait for mariadb - pgrep -x mysqld &>/dev/null || { + pgrep -x mysqld &>/dev/null || { echo "mariaDB process not found. Waiting..." while :; do [[ -S /run/mysqld/mysqld.sock ]] && break @@ -125,7 +125,9 @@ EOF local ID=$( grep instanceid config/config.php | awk -F "=> " '{ print $2 }' | sed "s|[,']||g" ) [[ "$ID" == "" ]] && { echo "failed to get ID"; return 1; } mkdir -p data/appdata_${ID}/theming/images - cp /usr/local/etc/logo /usr/local/etc/background data/appdata_${ID}/theming/images + cp /usr/local/etc/background data/appdata_${ID}/theming/images + cp /usr/local/etc/logo data/appdata_${ID}/theming/images/logo + cp /usr/local/etc/logo data/appdata_${ID}/theming/images/logoheader chown -R www-data:www-data data/appdata_${ID} } diff --git a/changelog.md b/changelog.md index 42aff436..cb32da94 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,7 @@ -[v1.18.2](https://github.com/nextcloud/nextcloudpi/commit/b737569) (2019-11-18) ncp-app: bump to NC17 +[v1.19.0](https://github.com/nextcloud/nextcloudpi/commit/c8e296c) (2019-11-30) upgrade to NC17.0.1 + +[v1.18.2 ](https://github.com/nextcloud/nextcloudpi/commit/0fc4aea) (2019-11-18) ncp-app: bump to NC17 [v1.18.1 ](https://github.com/nextcloud/nextcloudpi/commit/e975320) (2019-11-18) Letsencrypt: support second domain (#1025) diff --git a/etc/logo b/etc/logo index 79131687df8b046e624b1d25fd0d8a9da592b7db..859af800b0390ac4aa43dd5f512f37e85d5c5440 100644 GIT binary patch literal 18694 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 AV*mgE literal 77792 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

cIwm!sR4qd7^Z7E_bx+n1xe zJkd~}bZK9XZWV{cM?mwGORG4nt>Vxs4z1$QDh{pU&?*iR31h1`w2DKkIJAnx-&)0C zXkU&V+A|LA8HZt6#*{_2z2Eo#s$Xw}csZPV>IbiEUOI2*#CErNa+wf#&5I6(^=4l8 zZj&Jyh8r)?^3tejavpf?cZc#)U|6^QYP|7M&tcxHVQgVJ713e>h-5Te*3$>`&WqrACCY4 diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg index 90548740..42f99abc 100644 --- a/etc/ncp-config.d/nc-nextcloud.cfg +++ b/etc/ncp-config.d/nc-nextcloud.cfg @@ -9,7 +9,7 @@ { "id": "VER", "name": "Version", - "value": "16.0.5" + "value": "17.0.1" }, { "id": "BETA", diff --git a/etc/ncp.cfg b/etc/ncp.cfg index ce5e6692..1f458fc5 100644 --- a/etc/ncp.cfg +++ b/etc/ncp.cfg @@ -1,5 +1,5 @@ { - "nextcloud_version": "16.0.5", + "nextcloud_version": "17.0.1", "php_version": "7.3", "release": "buster" } diff --git a/updates/1.19.0.sh b/updates/1.19.0.sh index e7b88a39..731c147c 100644 --- a/updates/1.19.0.sh +++ b/updates/1.19.0.sh @@ -18,6 +18,16 @@ source /usr/local/etc/library.sh # sets NCVER PHPVER RELEASE } } +# if using NCP original logo, replace with the new version +datadir=$(ncc config:system:get datadirectory) +id=$(grep instanceid /var/www/nextcloud/config/config.php | awk -F "=> " '{ print $2 }' | sed "s|[,']||g") +sum_orig=ca39ff587bd899cb92eb0f5a6d429824 +sum_curr=$(md5sum "${datadir}"/appdata_*/theming/images/logo | awk '{ print $1 }') +[[ "${sum_orig}" == "${sum_curr}" ]] && { + cp etc/logo "${datadir}/appdata_${id}/theming/images/logo" + cp etc/logo "${datadir}/appdata_${id}/theming/images/logoheader" +} + # docker images only [[ -f /.docker-image ]] && { :