From 6c054501b659d943c62cd8a2a125d0d269f9961a Mon Sep 17 00:00:00 2001
From: Luke Ceddia <flukiluke@gmail.com>
Date: Thu, 11 Jan 2018 21:39:41 +1100
Subject: [PATCH] Don't restrict deployment to just master

---
 .travis/build.sh  | 2 +-
 .travis/deploy.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis/build.sh b/.travis/build.sh
index 53499c8e8..205762c0b 100755
--- a/.travis/build.sh
+++ b/.travis/build.sh
@@ -63,7 +63,7 @@ fi
 cd ../../
 rm qb64_testrun
 echo "Done"
-if [ "$TRAVIS_PULL_REQUEST" != "false" -o "$TRAVIS_BRANCH" != "master" ]; then exit; fi
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit; fi
 
 ###### Part 3: Establish new bootstrapee ######
 rm internal/source/*
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
index 79ead7fe4..d6952b764 100755
--- a/.travis/deploy.sh
+++ b/.travis/deploy.sh
@@ -4,7 +4,7 @@
 # mainversion=`awk '$1=="Version$" {split($3, A, /\"/);print A[2];}' < source/global/version.bas`
 # buildnum=`awk '$1=="BuildNum$" {split($3,A, /[\"\/]/); print A[3];}' < source/global/version.bas`
 TZ=UTC now=`date +"%F-%H-%M-%S"`
-filebase="/tmp/qb64_${now}_`echo ${TRAVIS_COMMIT} | sed 's/\(.......\).*$/\1/'`"
+filebase="/tmp/qb64_${now}_`echo ${TRAVIS_COMMIT} | sed 's/\(.......\).*$/\1/'`-${TRAVIS_BRANCH}"
 rm -r .dpl
 
 cd ..
@@ -13,6 +13,6 @@ tar --create --auto-compress --file ${filebase}_lnx.tar.gz --exclude-from=qb64/.
 7z a -xr@qb64/.travis/common-exclusion.list -xr@qb64/.travis/win-exclusion.list ${filebase}_win.7z qb64/ > /dev/null
 
 # Send to server
-scp ${filebase}_* m6rosupy1q2t@qb64.org:autobuilds/
+scp ${filebase}_* m6rosupy1q2t@qb64.org:autobuilds/${TRAVIS_BRANCH}/