From ace24540394d8108c17386a2a1164479367259ef Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Wed, 15 Jun 2016 19:33:07 +0000
Subject: [PATCH] [enh/fix] upgrade: retrieve sources from upstream. Fix nginx
 conf. - [enh] Retrieve PluXml 5.5 sources from upstream  - do not erase data
 folders  - only copy core - [fix] fix nginx conf by copying code from install
 script

---
 conf/upstream_version |  1 +
 scripts/upgrade       | 20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 conf/upstream_version

diff --git a/conf/upstream_version b/conf/upstream_version
new file mode 100644
index 0000000..9ad974f
--- /dev/null
+++ b/conf/upstream_version
@@ -0,0 +1 @@
+5.5
diff --git a/scripts/upgrade b/scripts/upgrade
index d530cf7..11c8476 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -14,9 +14,14 @@ path=${path%/}
 # Copy source files
 src_path=/var/www/$app
 sudo mkdir -p $src_path
-sudo cp -a ../sources/* $src_path
-sudo find $src_path -type f -name ".htaccess" | xargs sudo rm
-sudo rm $src_path/install.php
+
+# Retrieve sources and install them
+version=$(cat ../conf/upstream_version)
+wget -nc --quiet https://github.com/pluxml/PluXml/archive/$version.zip -P /tmp
+sudo unzip -q /tmp/$version.zip
+# Copy only core data and do not erase data
+sudo cp -r PluXml-$version/config.php PluXml-$version/core PluXml-$version/feed.php \
+PluXml-$version/index.php PluXml-$version/sitemap.php PluXml-$version/update $src_path
 
 sudo chown -R root: $src_path
 sudo chown -R www-data: $src_path/data
@@ -25,9 +30,14 @@ sudo find $src_path -type f | xargs sudo chmod 644
 sudo find $src_path -type d | xargs sudo chmod 755
 
 #configure nginx settings
+folder_path=${path%/}
+sudo sed -i "s@YNH_EXAMPLE_PATH@$path@g" ../conf/nginx.conf
+# If path is only / (without subfolder), add trailing slash to alias
+alias_path=$src_path
 nginx_conf="../conf/nginx.conf"
-sudo sed -i "s@YNH_EXAMPLE_PATH@$path@g" $nginx_conf
-sudo sed -i "s@YNH_EXAMPLE_ALIAS@$src_path@g" $nginx_conf
+[ "$path" == '/' ] && alias_path=$alias_path'/'
+sudo sed -i "s@YNH_EXAMPLE_ALIAS@$alias_path@g" $nginx_conf
+sudo sed -i "s@YNH_EXAMPLE_FOLDER@$folder_path@g" $nginx_conf
 sudo cp $nginx_conf /etc/nginx/conf.d/$domain.d/$app.conf
 
 # If app is public, add url to SSOWat conf as skipped_uris