From 5590e28efb66bb4b952e8a01bfd6523d6c75bede Mon Sep 17 00:00:00 2001
From: yalh76 <yalh@yahoo.com>
Date: Wed, 3 Apr 2019 22:31:26 +0200
Subject: [PATCH] Upgrade to 2.4.5 (#3)

* Switch source to github.tar.gz

* Fix $final_path creation

* upgrade to 2.4.5
---
 README.md       | 4 ++--
 conf/app.src    | 4 ++--
 manifest.json   | 2 +-
 scripts/install | 6 +++++-
 scripts/upgrade | 5 ++++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c0d4598..8c4bcd4 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to
 ## Overview
 Z-Push is an Exchange ActiveSync fronted written in php which lets you synchronize emails (imap/smtp backend) and calendar/contacts (carddav and caldav backend)
 
-**Shipped version:** 2.3.6
+**Shipped version:** 2.4.5
 
 * * *
 ### Known bug :
@@ -24,7 +24,7 @@ Z-Push is an Exchange ActiveSync fronted written in php which lets you synchroni
 - [x] z-push is now configured to use smtp to send emails instead of php_mail() function. This let us have emails signed by dkim for example.
 - [x] The current imap backend configuration seems able to handle email addresses different from login (for example login : john and email john.doe@domain.tld instead of john@domain.tld) - Further testing required !
 - [x] The sources are based on http://download.z-push.org/final/
-- [x] Use of version 2.3.6 final
+- [x] Use of version 2.4.5 final
 
 ## Documentation
 
diff --git a/conf/app.src b/conf/app.src
index 506e928..6265cd3 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=http://download.z-push.org/final/2.3/z-push-2.3.6.tar.gz
-SOURCE_SUM=9f86e4f6d822558bffdf05bebce4f1157ed7d8784b52d488935ef6d02efc27d7
+SOURCE_URL=https://github.com/Z-Hub/Z-Push/archive/3b937fb5c79068553198347ffad1f39f2e9d1b51.tar.gz
+SOURCE_SUM=d4d341946a6a2d24c4f9ceebeef8d0c3724c09ed5ad8c905fd1b4c44b25fe6fa
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index fc797b2..e388fed 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Z-Push is an Exchange ActiveSync fronted written in php which lets you synchronize emails (imap/smtp backend) and calendar/contacts (carddav and caldav backend)",
         "fr": "Z-Push est un fronted Exchange ActiveSync écrit en php qui permet de synchroniser vos email (backend imap/smtp) et vos contacts/calendrier (backend carddav et caldav)"
     },
-    "version": "2.3.6~ynh2",
+    "version": "2.4.5~ynh1",
     "url": "https://z-push.org",
     "license": "AGPL-3.0-or-later",
     "maintainer": {
diff --git a/scripts/install b/scripts/install
index d1b0937..00e822c 100755
--- a/scripts/install
+++ b/scripts/install
@@ -66,7 +66,11 @@ ynh_print_info "Setting up source files..."
 
 ynh_app_setting_set $app final_path $final_path
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source "$final_path"
+mkdir "$final_path"
+mkdir "$final_path/tmp"
+ynh_setup_source "$final_path/tmp"
+cp -a "$final_path/tmp/src/." "$final_path/."
+rm -r "$final_path/tmp"
 
 #=================================================
 # NGINX CONFIGURATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 995cdc5..f7abaca 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -95,7 +95,10 @@ ynh_abort_if_errors
 ynh_print_info "Upgrading source files..."
 
 # Download, check integrity, uncompress and patch the source from app.src
-ynh_setup_source "$final_path"
+mkdir "$final_path/tmp"
+ynh_setup_source "$final_path/tmp"
+cp -a "$final_path/tmp/src/." "$final_path/."
+rm -r "$final_path/tmp"
 
 #=================================================
 # NGINX CONFIGURATION