From f61f55116a4e330ebf108cbca934be02a06d6873 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Mon, 17 Feb 2020 22:51:49 -0600
Subject: user/nextcloud: make skipping major versions a hard error

---
 user/nextcloud/APKBUILD                          |  4 +-
 user/nextcloud/nextcloud-initscript.post-install |  2 +-
 user/nextcloud/nextcloud.post-upgrade            | 61 ------------------------
 user/nextcloud/nextcloud.pre-upgrade             | 61 ++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 64 deletions(-)
 delete mode 100644 user/nextcloud/nextcloud.post-upgrade
 create mode 100644 user/nextcloud/nextcloud.pre-upgrade

diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD
index 6e948b1ff..39c53fe86 100644
--- a/user/nextcloud/APKBUILD
+++ b/user/nextcloud/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=nextcloud
 pkgver=14.0.13
-pkgrel=0
+pkgrel=1
 pkgdesc="Self-hosted file sync and groupware server"
 url="https://nextcloud.com"
 arch="noarch"
@@ -42,7 +42,7 @@ provides="
 	$pkgname-provisioning_api=$pkgver-r$pkgrel
 	$pkgname-support=$pkgver-r$pkgrel
 "
-install="$pkgname.pre-install $pkgname.post-upgrade
+install="$pkgname.pre-install $pkgname.pre-upgrade
 	$pkgname-initscript.post-install"
 pkgusers="nextcloud"
 pkggroups="www-data"
diff --git a/user/nextcloud/nextcloud-initscript.post-install b/user/nextcloud/nextcloud-initscript.post-install
index 6b7fdf671..c90d4de68 100644
--- a/user/nextcloud/nextcloud-initscript.post-install
+++ b/user/nextcloud/nextcloud-initscript.post-install
@@ -17,7 +17,7 @@ cat <<"EOF"
 *
 * Point your web server to /run/nextcloud/fastcgi.sock and start
 * Nextcloud with `service nextcloud start`. You can modify php-fpm
-* settings in /etc/php7/fpm.d/nextcloud.conf.
+* settings in /etc/php/php-fpm.d/nextcloud.conf.
 *
 EOF
 
diff --git a/user/nextcloud/nextcloud.post-upgrade b/user/nextcloud/nextcloud.post-upgrade
deleted file mode 100644
index 8c48296ad..000000000
--- a/user/nextcloud/nextcloud.post-upgrade
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-ver_new="$1"
-ver_old="$2"
-
-maj_new="${ver_new%%.*}"
-maj_old="${ver_old%%.*}"
-maj_diff="$((maj_new - maj_old))"
-
-if [ "$(apk version -t "$ver_old" "14.0.13-r0")" = "<" ]; then
-	cat >&2 <<-EOF
-	*
-	* Some of Nextcloud's versions may be out of sync.
-	* You can check by running:
-	*
-	*     apk info -v | grep '^nextcloud-.*-$ver_old'
-	EOF
-fi
-
-if [ "$maj_diff" -lt 0 ]; then
-	cat >&2 <<-EOF
-	*
-	* Warning: Nextcloud does not support downgrading major versions.
-	* Only run "occ upgrade" if you have skipped major versions
-	* and are in the middle of fixing that!
-	*
-	EOF
-	exit 0
-fi
-
-if [ "$maj_diff" -gt 1 ]; then
-	cat >&2 <<-EOF
-	*
-	* Warning: Nextcloud does not support skipping major versions.
-	* Try the following instead:
-	*
-	EOF
-
-	maj_old="$((maj_old + 1))"
-	while [ "$maj_old" -lt "$maj_new" ]; do
-		cat >&2 <<-EOF
-		*     apk add nextcloud~$maj_old
-		*     occ upgrade
-		EOF
-		maj_old="$((maj_old + 1))"
-	done
-	cat >&2 <<-EOF
-	*     apk add nextcloud
-	*     occ upgrade
-	*
-	EOF
-	exit 0
-fi
-
-if [ "${ver_new%-r*}" != "${ver_old%-r*}" ]; then
-	cat >&2 <<-EOF
-	*
-	* Run "occ upgrade" to finish upgrade of your Nextcloud instance!
-	*
-	EOF
-fi
diff --git a/user/nextcloud/nextcloud.pre-upgrade b/user/nextcloud/nextcloud.pre-upgrade
new file mode 100644
index 000000000..2c700e8e7
--- /dev/null
+++ b/user/nextcloud/nextcloud.pre-upgrade
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+ver_new="$1"
+ver_old="$2"
+
+maj_new="${ver_new%%.*}"
+maj_old="${ver_old%%.*}"
+maj_diff="$((maj_new - maj_old))"
+
+if [ "$(apk version -t "$ver_old" "14.0.13-r0")" = "<" ]; then
+	cat >&2 <<-EOF
+	*
+	* Some of Nextcloud's versions may be out of sync.
+	* You can check by running:
+	*
+	*     apk info -v | grep '^nextcloud-.*-$ver_old'
+	EOF
+fi
+
+if [ "$maj_diff" -lt 0 ]; then
+	cat >&2 <<-EOF
+	*
+	* Warning: Nextcloud does not support downgrading major versions.
+	* Only run "occ upgrade" if you have skipped major versions
+	* and are in the middle of fixing that!
+	*
+	EOF
+	exit 0
+fi
+
+if [ "$maj_diff" -gt 1 ]; then
+	cat >&2 <<-EOF
+	*
+	* Warning: Nextcloud does not support skipping major versions.
+	* Try the following instead:
+	*
+	EOF
+
+	maj_old="$((maj_old + 1))"
+	while [ "$maj_old" -lt "$maj_new" ]; do
+		cat >&2 <<-EOF
+		*     apk add nextcloud~$maj_old
+		*     occ upgrade
+		EOF
+		maj_old="$((maj_old + 1))"
+	done
+	cat >&2 <<-EOF
+	*     apk add -ul nextcloud
+	*     occ upgrade
+	*
+	EOF
+	exit 1
+fi
+
+if [ "${ver_new%-r*}" != "${ver_old%-r*}" ]; then
+	cat >&2 <<-EOF
+	*
+	* Run "occ upgrade" to finish upgrade of your Nextcloud instance!
+	*
+	EOF
+fi
-- 
cgit v1.2.3-70-g09d2