From dea9f13880ba7c3114a484f930e74fca86d50917 Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Sun, 7 Oct 2018 10:43:39 +0200
Subject: [PATCH 1/4] Upgrade to 1.5.2

---
 README.md            | 2 +-
 conf/app-upgrade.src | 4 ++--
 conf/app.src         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 35572cb..0329d0e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 * http://getgrav.org/
 * https://github.com/getgrav/grav
 
-Provided version: **1.5.1**
+Provided version: **1.5.2**
 
 ## Installation
 
diff --git a/conf/app-upgrade.src b/conf/app-upgrade.src
index 08afa35..30fed8f 100644
--- a/conf/app-upgrade.src
+++ b/conf/app-upgrade.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.1/grav-update-v1.5.1.zip
-SOURCE_SUM=D1D1BD1937848F54A707778DCF315EB17D95A3D9094DCC4189F0189C4824FC7C
+SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.2/grav-update-v1.5.2.zip
+SOURCE_SUM=A8E0289419DC9DB8D64758306376DBF0E827CC45F4015A6FA678C2EE36B32FF8
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/app.src b/conf/app.src
index a40951f..d6ba121 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.1/grav-admin-v1.5.1.zip
-SOURCE_SUM=34f48f984ef734e66ccc1c9fc30f5d5f512ee0febc4576c63b657bf4c5461160
+SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.5.2/grav-admin-v1.5.2.zip
+SOURCE_SUM=42B20D1C569A3089BBE8111AEFD133FE07BB455BFC8A55C3A8A0F0EB62070609
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
\ No newline at end of file
+SOURCE_FILENAME=

From d00b268e2ce33b3bb59cf50c626d6db99ef50b4c Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Sun, 7 Oct 2018 11:27:33 +0200
Subject: [PATCH 2/4] [enh] Update plugins after upgrade

---
 scripts/_common.sh | 14 ++++++++++++++
 scripts/upgrade    | 10 ++++++++++
 2 files changed, 24 insertions(+)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index a9bf588..2541082 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1 +1,15 @@
 #!/bin/bash
+
+# Execute a command as another user
+# usage: exec_as USER COMMAND [ARG ...]
+exec_as() {
+	local USER=$1
+	shift 1
+
+	if [[ $USER = $(whoami) ]]
+	then
+		eval $@
+	else
+		sudo -u "$USER" $@
+	fi
+}
diff --git a/scripts/upgrade b/scripts/upgrade
index c054c34..1b120d2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -103,6 +103,16 @@ ynh_system_user_create "$app"
 # Create a dedicated php-fpm config
 ynh_add_fpm_config
 
+#=================================================
+# SPECIFIC UPGRADE
+#=================================================
+# UPDATE PLUGINS
+#=================================================
+
+pushd "$final_path"
+	exec_as "$app" "bin/gpm update -y"
+popd
+
 #=================================================
 # GENERIC FINALIZATION
 #=================================================

From a4f4e7e3448e7e9284b329a36e191b4a6001ac01 Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Sat, 13 Oct 2018 11:26:18 +0200
Subject: [PATCH 3/4] [mod] Swap chown and plugins update [mod] Use cd instead
 of pushd

---
 scripts/upgrade | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 1b120d2..e446e41 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -103,24 +103,18 @@ ynh_system_user_create "$app"
 # Create a dedicated php-fpm config
 ynh_add_fpm_config
 
-#=================================================
-# SPECIFIC UPGRADE
-#=================================================
-# UPDATE PLUGINS
-#=================================================
-
-pushd "$final_path"
-	exec_as "$app" "bin/gpm update -y"
-popd
-
-#=================================================
-# GENERIC FINALIZATION
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================
 
 chown -R "$app": "$final_path"
 
+#=================================================
+# UPDATE PLUGINS
+#=================================================
+
+exec_as "$app" "cd $final_path && bin/gpm update -y"
+
 #=================================================
 # SETUP SSOWAT
 #=================================================

From 45bf080f3d02eaf4b05af2546738539c39124bbb Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Sat, 20 Oct 2018 20:44:04 +0200
Subject: [PATCH 4/4] Remove gpm update

---
 scripts/upgrade | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index e446e41..747f5a3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -109,12 +109,6 @@ ynh_add_fpm_config
 
 chown -R "$app": "$final_path"
 
-#=================================================
-# UPDATE PLUGINS
-#=================================================
-
-exec_as "$app" "cd $final_path && bin/gpm update -y"
-
 #=================================================
 # SETUP SSOWAT
 #=================================================