From 67d8e515866401c3bf14a4b4d57d38ddcc169c0e Mon Sep 17 00:00:00 2001
From: anmol26s <github@datamol.org>
Date: Mon, 24 Sep 2018 20:04:40 +0530
Subject: [PATCH] Upgrade to 2018.09

---
 conf/addons.src | 4 ++--
 conf/app.src    | 4 ++--
 scripts/install | 2 +-
 scripts/restore | 2 +-
 scripts/upgrade | 8 +++++++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/conf/addons.src b/conf/addons.src
index 3cc7837..baced9e 100644
--- a/conf/addons.src
+++ b/conf/addons.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/friendica/friendica-addons/archive/2018.05.zip 
-SOURCE_SUM=e00143e9302b25b01886deac5302d326 
+SOURCE_URL=https://github.com/friendica/friendica-addons/archive/2018.09.zip
+SOURCE_SUM=9a9e4702419e369ffc7ecfd8fb5b5f97
 SOURCE_SUM_PRG=md5sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/conf/app.src b/conf/app.src
index 293fc6b..5c1a65f 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/friendica/friendica/archive/2018.05.zip
-SOURCE_SUM=9b5497423ca7ce4b581fa97ca12f412d
+SOURCE_URL=https://github.com/friendica/friendica/archive/2018.09.zip
+SOURCE_SUM=f127463d2c6c1c593b1f1ae5ea80dcf3
 SOURCE_SUM_PRG=md5sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
diff --git a/scripts/install b/scripts/install
index c847241..8c1d9e2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -138,7 +138,7 @@ ynh_add_fpm_config
 sudo chown -R www-data:www-data $final_path
 # 3 - some extra folders
 sudo mkdir -p "${final_path}/view/smarty3"
-sudo chmod -R 777 $final_path/view/smarty3
+sudo chmod -R 775 $final_path/view/smarty3
 chown -R $app: $final_path
 
 # Set up poller
diff --git a/scripts/restore b/scripts/restore
index 879d349..5995bdf 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -84,7 +84,7 @@ ynh_install_app_dependencies 'php-mbstring|base-files(<<9.0)' php5-cli 'php5-ima
 
 
 # set permission
-sudo chmod -R 777 $final_path/view/smarty3
+chmod -R 775 $final_path/view/smarty3
 
 #=================================================
 # RESTORE THE CRON FILE
diff --git a/scripts/upgrade b/scripts/upgrade
index 2e85377..2f6befb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -40,6 +40,9 @@ ynh_install_app_dependencies 'php-mbstring|base-files(<<9.0)' php5-cli 'php5-ima
 tmpdir="$(mktemp -d)"
 # Backup the config file in the temp dir
 cp -a "$final_path/.htconfig.php" "$tmpdir/.htconfig.php"
+if [ -f $final_path/.htaccess ]; then
+    cp -a "$final_path/.htaccess" "$tmpdir/.htaccess"
+fi
 
 # If final_path doesn't exist, create it
 if [ -z $final_path ]; then
@@ -57,6 +60,9 @@ path_url=$(ynh_normalize_url_path $path_url)
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source "$final_path"
 sudo cp -a "$tmpdir/.htconfig.php" "${final_path}"
+if [ -f $final_path/.htaccess ]; then
+    cp -af "$tmpdir/.htaccess" "${final_path}"
+fi
 sudo rm -Rf "$tmpdir"
 
 #Copy Addons
@@ -65,7 +71,7 @@ ynh_setup_source "$final_path/addon" "addons"
 
 # 3 - some extra folders
 sudo mkdir -p "${final_path}/view/smarty3"
-sudo chmod -R 777 $final_path/view/smarty3
+sudo chmod -R 775 $final_path/view/smarty3
 
 #=================================================
 # CREATE DEDICATED USER