From b60691e6f30382c288606f8859b1ccd7eefa8f81 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 10 Aug 2019 14:46:34 +0200
Subject: [PATCH 1/3] Fix scope of exec_occ function

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 8e75255..320381e 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -176,16 +176,16 @@ ynh_install_app_dependencies $pkg_dependencies
 # VERSION TO THE NEXT ONE
 #=================================================
 
+# Define a function to execute commands with `occ`
+exec_occ() {
+(cd "$final_path" && exec_as "$app" \
+    php occ --no-interaction --no-ansi "$@")
+}
+
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
     ynh_script_progression --message="Upgrading nextcloud..." --weight=3
 
-    # Define a function to execute commands with `occ`
-    exec_occ() {
-    (cd "$final_path" && exec_as "$app" \
-        php occ --no-interaction --no-ansi "$@")
-    }
-
     # Load the last available version
     source upgrade.d/upgrade.last.sh
     last_version=$next_version

From 8482d00f1a43aed960a4e5a91ebb889c4d182b67 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 10 Aug 2019 17:20:47 +0200
Subject: [PATCH 2/3] Change scope of create_external_storage as well

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 320381e..f6bdc01 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -182,6 +182,18 @@ exec_occ() {
     php occ --no-interaction --no-ansi "$@")
 }
 
+# Define a function to add an external storage
+# Create the external storage for the given folders and enable sharing
+create_external_storage() {
+local datadir="$1"
+local mount_name="$2"
+local mount_id=`exec_occ files_external:create --output=json \
+    "$mount_name" 'local' 'null::null' -c "datadir=$datadir" || true`
+! [[ $mount_id =~ ^[0-9]+$ ]] \
+    && ynh_print_warn --message="Unable to create external storage" \
+    || exec_occ files_external:option "$mount_id" enable_sharing true
+}
+
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
     ynh_script_progression --message="Upgrading nextcloud..." --weight=3
@@ -323,18 +335,6 @@ then
     # MOUNT HOME FOLDERS AS EXTERNAL STORAGE
     #=================================================
 
-    # Define a function to add an external storage
-    # Create the external storage for the given folders and enable sharing
-    create_external_storage() {
-    local datadir="$1"
-    local mount_name="$2"
-    local mount_id=`exec_occ files_external:create --output=json \
-        "$mount_name" 'local' 'null::null' -c "datadir=$datadir" || true`
-    ! [[ $mount_id =~ ^[0-9]+$ ]] \
-        && ynh_print_warn --message="Unable to create external storage" \
-        || exec_occ files_external:option "$mount_id" enable_sharing true
-    }
-
     # Enable External Storage and create local mount to home folder as needed
     if [ $user_home -eq 1 ]; then
         exec_occ app:enable files_external

From b9d8e09fee2538e76b93e86b2829dcd51c7df867 Mon Sep 17 00:00:00 2001
From: Jimmy Monin <jimmy@monin.net>
Date: Sat, 10 Aug 2019 19:28:43 +0200
Subject: [PATCH 3/3] Change also datadir's scope

---
 scripts/upgrade | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index f6bdc01..2e3f7ec 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -193,6 +193,8 @@ local mount_id=`exec_occ files_external:create --output=json \
     && ynh_print_warn --message="Unable to create external storage" \
     || exec_occ files_external:option "$mount_id" enable_sharing true
 }
+# Define app's data directory
+datadir="/home/yunohost.app/$app/data"
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
@@ -202,9 +204,6 @@ then
     source upgrade.d/upgrade.last.sh
     last_version=$next_version
 
-    # Define app's data directory
-    datadir="/home/yunohost.app/$app/data"
-
     # Set write access for the following commands
     chown -R $app: "$final_path" "$datadir"