From 93984133c1790c757da003d087a640768ae14f11 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@ucc.asn.au>
Date: Thu, 19 Mar 2015 14:13:21 +0800
Subject: [PATCH] Add config to push script

---
 BuildAndPush | 20 +++++++++++---------
 client.conf  |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/BuildAndPush b/BuildAndPush
index f0cd247..bd27baf 100755
--- a/BuildAndPush
+++ b/BuildAndPush
@@ -5,8 +5,10 @@
 set -o errexit
 set -o nounset
 CLIENT_PATH=/usr/local/bin/dispense
-SETPERMS="true"
-#SETPERMS="chown root:root $CLIENT_PATH; chmod u+s $CLIENT_PATH"
+EXTRA="true"
+EXTRA=$EXTRA";mkdir -p /etc/opendispense/"
+EXTRA=$EXTRA";cp ~tpg/gitclones/opendispense2/client.cfg /etc/opendispense/client.cfg"
+#EXTRA="chown root:root $CLIENT_PATH; chmod u+s $CLIENT_PATH"
 MAKEMAN="make -C ~tpg/gitclones/opendispense2/docs/"
 
 cd ~/gitclones/opendispense2
@@ -26,15 +28,15 @@ cp ~/gitclones/opendispense2/dispense /away/wheel/tpg/dispense_64bit
 cp /usr/share/man/man1/dispense.1.gz /away/wheel/tpg/dispense.1.gz
 
 # Copy 32-bit
-$SSH root@mussel "cp ~tpg/gitclones/opendispense2_32bit/dispense $CLIENT_PATH; $SETPERMS; $MAKEMAN"
-$SSH root@mooneye "cp ~tpg/gitclones/opendispense2_32bit/dispense $CLIENT_PATH; $SETPERMS; $MAKEMAN"
+$SSH root@mussel "cp ~tpg/gitclones/opendispense2_32bit/dispense $CLIENT_PATH; $EXTRA; $MAKEMAN"
+$SSH root@mooneye "cp ~tpg/gitclones/opendispense2_32bit/dispense $CLIENT_PATH; $EXTRA; $MAKEMAN"
 
 # Copy 64-bit
-$SSH root@motsugo "cp ~tpg/gitclones/opendispense2/dispense $CLIENT_PATH; $SETPERMS; $MAKEMAN"
-$SSH root@mantis "cp ~tpg/gitclones/opendispense2/dispense $CLIENT_PATH; $SETPERMS; $MAKEMAN"
-#$SSH root@martello "cp ~tpg/gitclones/opendispense2/dispense $CLIENT_PATH; $SETPERMS; $MAKEMAN"
-$SSH root@merlo "cp ~tpg/gitclones/opendispense2/dispense $CLIENT_PATH; $SETPERMS; $MAKEMAN"
+$SSH root@motsugo "cp ~tpg/gitclones/opendispense2/dispense $CLIENT_PATH; $EXTRA; $MAKEMAN"
+#$SSH root@mantis "cp ~tpg/gitclones/opendispense2/dispense $CLIENT_PATH; $EXTRA; $MAKEMAN"
+#$SSH root@martello "cp ~tpg/gitclones/opendispense2/dispense $CLIENT_PATH; $EXTRA; $MAKEMAN"
+$SSH root@merlo "cp ~tpg/gitclones/opendispense2/dispense $CLIENT_PATH; $EXTRA; $MAKEMAN"
 
 # Copy Away version
-$SSH root@meersau "cp ~tpg/dispense_32bit $CLIENT_PATH; $SETPERMS; cp ~tpg/dispense.1.gz /usr/share/man/man1/dispense.1.gz"
+$SSH root@meersau "cp ~tpg/dispense_32bit $CLIENT_PATH; cp ~tpg/dispense.1.gz /usr/share/man/man1/dispense.1.gz"
 
diff --git a/client.conf b/client.conf
index ff657ee..3f374ab 100644
--- a/client.conf
+++ b/client.conf
@@ -2,4 +2,4 @@
 # OpenDispense2 Client config file
 #
 dispense_server merlo.ucc.asn.au
-dispense_port 11021
+dispense_port 11020
-- 
2.20.1