From f524825a9683df4cccba09fac2ee489a57e65134 Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Tue, 7 Feb 2017 22:20:48 +0000
Subject: [PATCH] Update to use file from z-push.org

---
 scripts/install | 10 ++++------
 scripts/upgrade | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/scripts/install b/scripts/install
index a18ad92..cf1a1aa 100755
--- a/scripts/install
+++ b/scripts/install
@@ -98,13 +98,11 @@ ynh_app_setting_set "$app" final_phpconf "$final_phpconf"
 sudo mkdir -p $final_path
 
 # We download the sources and check the md5sum
-SHA1=`sudo cat ../sources/source_sha1`;
-sed -i "s@SHA1TOCHANGE@$SHA1@g" ../sources/source_url
-sed -i "s@SHA1TOCHANGE@$SHA1@g" ../sources/source_md5
-sudo wget -nv -i ../sources/source_url -O Z-Push-contrib-${SHA1}.zip
+SFILE=`sudo cat ../sources/source_file`;
+sudo wget -nv -i ../sources/source_url -O $SFILE
 sudo md5sum -c ../sources/source_md5 --status || (echo "Corrupt source" >&2 && false)
-sudo unzip Z-Push-contrib-${SHA1}.zip -d ../sources/
-sudo cp -R ../sources/Z-Push-contrib-${SHA1}/* $final_path
+sudo tar xvf $SFILE -d ../sources/
+sudo cp -R ../sources/$SFILE/* $final_path
 
 # Configuration
 sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" ../conf/config.php
diff --git a/scripts/upgrade b/scripts/upgrade
index 0745fcc..07ff700 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -59,13 +59,11 @@ sudo rm -f $final_phpconf
 sudo mkdir -p $final_path
 
 # We download the sources and check the md5sum
-SHA1=`sudo cat ../sources/source_sha1`;
-sed -i "s@SHA1TOCHANGE@$SHA1@g" ../sources/source_url
-sed -i "s@SHA1TOCHANGE@$SHA1@g" ../sources/source_md5
-sudo wget -nv -i ../sources/source_url -O Z-Push-contrib-${SHA1}.zip
+SFILE=`sudo cat ../sources/source_file`;
+sudo wget -nv -i ../sources/source_url -O $SFILE
 sudo md5sum -c ../sources/source_md5 --status || (echo "Corrupt source" >&2 && false)
-sudo unzip Z-Push-contrib-${SHA1}.zip -d ../sources/
-sudo cp -R ../sources/Z-Push-contrib-${SHA1}/* $final_path
+sudo tar xvf $SFILE -d ../sources/
+sudo cp -R ../sources/$SFILE/* $final_path
 
 # Configuration
 sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" ../conf/config.php