From 2a1cb0348459ed58cf5988ac5ea806cb01e33fb6 Mon Sep 17 00:00:00 2001
From: Xawotihs <xawotihs@users.noreply.github.com>
Date: Sun, 16 Aug 2015 18:02:22 +0200
Subject: [PATCH 1/5] OMG what a stupid typo

---
 tools/build-macos-script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh
index 48e49fc75..6d6ead026 100755
--- a/tools/build-macos-script.sh
+++ b/tools/build-macos-script.sh
@@ -14,7 +14,7 @@ git config --global user.email $GH_EMAIL
 git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git"
 
 ## Delete remote Travis-Mac branch (if any)
-export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH\$")
+export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH")
 if test -n "$REMOTE" ; then
     # Push (delete) remote branch on temote server (e.g. github)
     git push origin --delete "$TRAVIS_MAC_BRANCH"

From 7d8fdbfd58030b1b1b515ea2f90983374de867b1 Mon Sep 17 00:00:00 2001
From: Xawotihs <xawotihs@users.noreply.github.com>
Date: Sun, 16 Aug 2015 18:24:57 +0200
Subject: [PATCH 2/5] Restored branch removal and added some debug

---
 tools/build-macos-script.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh
index 6d6ead026..a71a96af2 100755
--- a/tools/build-macos-script.sh
+++ b/tools/build-macos-script.sh
@@ -16,6 +16,9 @@ git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git
 ## Delete remote Travis-Mac branch (if any)
 export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH")
 if test -n "$REMOTE" ; then
+    echo "Removing old $TRAVIS_MAC_BRANCH branch"
+    # Delete remote branch
+    git branch -r -D "origin/$TRAVIS_MAC_BRANCH"
     # Push (delete) remote branch on temote server (e.g. github)
     git push origin --delete "$TRAVIS_MAC_BRANCH"
 fi
@@ -26,7 +29,6 @@ git checkout -q -b "$TRAVIS_MAC_BRANCH" "$TRAVIS_BRANCH"
 ## Write a new Travis-CI configuration file
 cp tools/macos.travis.yml .travis.yml
 git add .travis.yml
-git rm appveyor.yml
 git commit -m "Auto-Updated Travis-CI configuration for Mac"
 ## Push new branch to remote server
 git push -q origin $TRAVIS_MAC_BRANCH:$TRAVIS_MAC_BRANCH  2> /dev/null > /dev/null

From 07683480b454d3ae66abfddbb41e70c643ed7955 Mon Sep 17 00:00:00 2001
From: Xawotihs <xawotihs@users.noreply.github.com>
Date: Sun, 16 Aug 2015 18:41:36 +0200
Subject: [PATCH 3/5] build => release => tag => build ...

---
 appveyor.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index f084c4475..b0a86032a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -9,6 +9,9 @@ branches:
   # blacklist
   except:
     - travis_mac_osx
+# Do not build on tags (GitHub only)
+skip_tags: true
+
 #---------------------------------#
 #    environment configuration    #
 #---------------------------------#

From 8ce85636d98e517576e2250116dc60e44ca638a7 Mon Sep 17 00:00:00 2001
From: Xawotihs <xawotihs@users.noreply.github.com>
Date: Sun, 16 Aug 2015 20:52:10 +0200
Subject: [PATCH 4/5] More debug

---
 tools/build-macos-script.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh
index a71a96af2..da91c0a20 100755
--- a/tools/build-macos-script.sh
+++ b/tools/build-macos-script.sh
@@ -15,12 +15,14 @@ git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git
 
 ## Delete remote Travis-Mac branch (if any)
 export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH")
-if test -n "$REMOTE" ; then
+if [ test -n "$REMOTE" ]; then
     echo "Removing old $TRAVIS_MAC_BRANCH branch"
     # Delete remote branch
     git branch -r -D "origin/$TRAVIS_MAC_BRANCH"
     # Push (delete) remote branch on temote server (e.g. github)
     git push origin --delete "$TRAVIS_MAC_BRANCH"
+else
+    echo "No $TRAVIS_MAC_BRANCH to remove"
 fi
 
 ## Create a new branch

From 8c6f694645b5a91b5fd84924c5c74b1bb3fb2b22 Mon Sep 17 00:00:00 2001
From: Xawotihs <xawotihs@users.noreply.github.com>
Date: Sun, 16 Aug 2015 21:11:41 +0200
Subject: [PATCH 5/5] Replaced suspicious test

---
 tools/build-macos-script.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/build-macos-script.sh b/tools/build-macos-script.sh
index da91c0a20..ca3eec0d1 100755
--- a/tools/build-macos-script.sh
+++ b/tools/build-macos-script.sh
@@ -15,7 +15,7 @@ git remote set-url origin "https://${GH_TOKEN}@github.com/WagicProject/wagic.git
 
 ## Delete remote Travis-Mac branch (if any)
 export REMOTE=$(git branch -r | grep "origin/$TRAVIS_MAC_BRANCH")
-if [ test -n "$REMOTE" ]; then
+if [ "$REMOTE" = "origin/$TRAVIS_MAC_BRANCH" ]; then
     echo "Removing old $TRAVIS_MAC_BRANCH branch"
     # Delete remote branch
     git branch -r -D "origin/$TRAVIS_MAC_BRANCH"