bump bootstrap.sh to incoming 0.03 tag

fixes #195

management/templates/aliases.html

@@ -13,7 +13,7 @@
   <div class="form-group">
     <label for="addaliasEmail" class="col-sm-2 control-label">Email Address</label>
     <div class="col-sm-10">
-      <input type="text" class="form-control" id="addaliasEmail" placeholder="Incoming Email Address">
+      <input type="email" class="form-control" id="addaliasEmail" placeholder="Incoming Email Address">
     </div>
   </div>
   <div class="form-group">

setup/bootstrap.sh

@@ -7,7 +7,7 @@
 #########################################################
 
 if [ -z "$TAG" ]; then
-	TAG=v0.02
+	TAG=v0.03
 fi
 
 # Are we running as root?

setup/webmail.sh

@@ -28,14 +28,24 @@ apt_install \
 # Now that we're beyond that, get rid of those debs before installing from source.
 apt-get purge -qq -y roundcube*
 
-# Install Roundcube from source if it is not already present.
+# Install Roundcube from source if it is not already present or if it is out of date.
-# TODO: Check version?
+VERSION=1.0.2
-if [ ! -d /usr/local/lib/roundcubemail ]; then
+needs_update=0 #NODOC
+if [ ! -f /usr/local/lib/roundcubemail/version ]; then
+	# not installed yet
+	needs_update=1 #NODOC
+elif [[ $VERSION != `cat /usr/local/lib/roundcubemail/version` ]]; then
+	# checks if the version is what we want
+	needs_update=1 #NODOC
+fi
+if [ $needs_update == 1 ]; then
+	echo installing roudcube webmail $VERSION...
 	rm -f /tmp/roundcube.tgz
-	wget -qO /tmp/roundcube.tgz http://downloads.sourceforge.net/project/roundcubemail/roundcubemail/1.0.2/roundcubemail-1.0.2.tar.gz
+	wget -qO /tmp/roundcube.tgz http://downloads.sourceforge.net/project/roundcubemail/roundcubemail/1.0.2/roundcubemail-$VERSION.tar.gz
 	tar -C /usr/local/lib -zxf /tmp/roundcube.tgz
-	mv /usr/local/lib/roundcubemail-1.0.2/ /usr/local/lib/roundcubemail
+	mv /usr/local/lib/roundcubemail-$VERSION/ /usr/local/lib/roundcubemail
 	rm -f /tmp/roundcube.tgz
+	echo $VERSION > /usr/local/lib/roundcubemail/version
 fi
 
 # ### Configuring Roundcube

setup/zpush.sh

@@ -21,30 +21,33 @@ apt_install \
 php5enmod imap
 
 # Copy Z-Push into place.
+TARGETHASH=d0cd5a47c53afac5c3b287006dc8a48a1c4ffcd5
 needs_update=0 #NODOC
 if [ ! -f /usr/local/lib/z-push/version ]; then
 	needs_update=1 #NODOC
-elif [[ `curl -s https://api.github.com/repos/fmbiete/Z-Push-contrib/git/refs/heads/master` != `cat /usr/local/lib/z-push/version` ]]; then
+elif [[ $TARGETHASH != `cat /usr/local/lib/z-push/version` ]]; then
 	# checks if the version 
 	needs_update=1 #NODOC
 fi
 if [ $needs_update == 1 ]; then
 	rm -rf /usr/local/lib/z-push
-	rm -f /tmp/zpush.zip
+	rm -f /tmp/zpush-repo
 	echo installing z-push \(fmbiete fork\)...
-	wget -qO /tmp/zpush.zip https://github.com/fmbiete/Z-Push-contrib/archive/master.zip
+	git clone -q https://github.com/fmbiete/Z-Push-contrib /tmp/zpush-repo
-	unzip -q /tmp/zpush.zip -d /usr/local/lib/
+	(cd /tmp/zpush-repo/; git checkout -q $TARGETHASH;)
-	mv /usr/local/lib/Z-Push-contrib-master /usr/local/lib/z-push
+	rm -rf /tmp/zpush-repo/.git
+	mv /tmp/zpush-repo /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;
+	rm -f /tmp/zpush-repo
-	curl -s https://api.github.com/repos/fmbiete/Z-Push-contrib/git/refs/heads/master > /usr/local/lib/z-push/version
+	echo $TARGETHASH > /usr/local/lib/z-push/version
 fi
 
 # Configure default config.
 sed -i "s^define('TIMEZONE', .*^define('TIMEZONE', '$(cat /etc/timezone)');^" /usr/local/lib/z-push/config.php
 sed -i "s/define('BACKEND_PROVIDER', .*/define('BACKEND_PROVIDER', 'BackendCombined');/" /usr/local/lib/z-push/config.php
+sed -i "s/define('USE_FULLEMAIL_FOR_LOGIN', .*/define('USE_FULLEMAIL_FOR_LOGIN', true);/" /usr/local/lib/z-push/config.php
 
 # Configure BACKEND
 rm -f /usr/local/lib/z-push/backend/combined/config.php