From 4d64246b2203026e73a9d9e10880e06717ca854c Mon Sep 17 00:00:00 2001
From: Joshua Tauberer <jt@occams.info>
Date: Tue, 12 Aug 2014 12:03:36 +0000
Subject: [PATCH] tweak z-push/owncloud installation scripts: hide output,
 check if z-push needs an update, dont use /etc/timezone because its contents
 would need to be escaped before being passed into sed

---
 setup/owncloud.sh |  4 ++--
 setup/zpush.sh    | 21 +++++++++++++++------
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/setup/owncloud.sh b/setup/owncloud.sh
index 12059fff..a1ee73c7 100644
--- a/setup/owncloud.sh
+++ b/setup/owncloud.sh
@@ -17,7 +17,7 @@ if [ ! -d /usr/local/lib/owncloud ]; then
 	echo Installing ownCloud...
 	rm -f /tmp/owncloud.zip
 	wget -qO /tmp/owncloud.zip https://download.owncloud.org/community/owncloud-7.0.1.zip
-	unzip /tmp/owncloud.zip -d /usr/local/lib
+	unzip -q /tmp/owncloud.zip -d /usr/local/lib
 	rm -f /tmp/owncloud.zip
 fi
 
@@ -75,7 +75,7 @@ chmod -R 777 /usr/local/lib/owncloud/apps/mail/vendor/ezyang/htmlpurifier/librar
 
 # Use Crontab instead of AJAX/webcron in ownCloud
 # TODO: somehow change the cron option in ownClouds config, not exposed afaik?
-(crontab -u www-user -l; echo "*/15  *  *  *  * php -f /usr/local/lib/owncloud/cron.php" ) | crontab -u www-user -
+(crontab -u www-data -l; echo "*/15  *  *  *  * php -f /usr/local/lib/owncloud/cron.php" ) | crontab -u www-data -
 
 php5enmod imap
 restart_service php5-fpm
diff --git a/setup/zpush.sh b/setup/zpush.sh
index 7e2c0cf2..8acd4690 100755
--- a/setup/zpush.sh
+++ b/setup/zpush.sh
@@ -19,20 +19,29 @@ apt_install \
 php5enmod imap
 
 # Copy Z-Push into place.
-if [ ! -d /usr/local/lib/z-push ]; then
+needs_update=0
+if [ ! -f /usr/local/lib/z-push/version ]; then
+	needs_update=1
+elif [[ `curl -s https://api.github.com/repos/fmbiete/Z-Push-contrib/git/refs/heads/master` != `cat /usr/local/lib/z-push/version` ]]; then
+	# checks if the version 
+	needs_update=1
+fi
+if [ $needs_update == 1 ]; then
+	rm -rf /usr/local/lib/z-push
 	rm -f /tmp/zpush.zip
-	echo Installing z-push...
+	echo Installing z-push \(fmbiete fork\)...
 	wget -qO /tmp/zpush.zip https://github.com/fmbiete/Z-Push-contrib/archive/master.zip
-	unzip /tmp/zpush.zip -d /usr/local/lib/
+	unzip -q /tmp/zpush.zip -d /usr/local/lib/
 	mv /usr/local/lib/Z-Push-contrib-master /usr/local/lib/z-push
+	rm -f /usr/sbin/z-push-{admin,top}
 	ln -s /usr/local/lib/z-push/z-push-admin.php /usr/sbin/z-push-admin
 	ln -s /usr/local/lib/z-push/z-push-top.php /usr/sbin/z-push-top
 	rm /tmp/zpush.zip;
+	curl -s https://api.github.com/repos/fmbiete/Z-Push-contrib/git/refs/heads/master > /usr/local/lib/z-push/version
 fi
 
-# Configure default config
-TIMEZONE=`cat /etc/timezone`
-sed -i "s/define('TIMEZONE', .*/define('TIMEZONE', '$TIMEZONE');/" /usr/local/lib/z-push/config.php
+# Configure default config.
+sed -i "s/define('TIMEZONE', .*/define('TIMEZONE', 'Etc\/UTC');/" /usr/local/lib/z-push/config.php
 sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php
 
 # Configure BACKEND