From bde475c384d2858fb124b4e19302a9601c5d1530 Mon Sep 17 00:00:00 2001
From: David Brown <dave.github@brownsmeet.com>
Date: Wed, 7 Dec 2016 14:03:07 +0000
Subject: [PATCH] Silly me, it's a .sh, not a .pl., temporarily have buildall
 pick up the new .sh.

---
 src/tools/make/buildall.pl  |  6 +++---
 src/tools/make/getbranch.pl | 14 --------------
 src/tools/make/getbranch.sh |  5 +++++
 3 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 src/tools/make/getbranch.pl
 create mode 100644 src/tools/make/getbranch.sh

diff --git a/src/tools/make/buildall.pl b/src/tools/make/buildall.pl
index e8b6ac1c..b1a022a0 100755
--- a/src/tools/make/buildall.pl
+++ b/src/tools/make/buildall.pl
@@ -15,12 +15,12 @@ my %machines = (
   "cygwin"  => ['-p5932 dave@wax', "",     "oberon/cygwin/voc",        "export CC=gcc && make full;"
                                                                        . "cd ~;"
                                                                        . "sh start64.sh \\\"cd oberon/cygwin/voc &&"
-                                                                                         . "src/tools/make/getbranch $branch &&"
+                                                                                         . "src/tools/make/getbranch.sh $branch &&"
                                                                                          . "export CC=gcc && make full;\\\""],
   "mingw"   => ['-p5932 dave@wax', "",     "oberon/mingw/voc",         "export CC=i686-w64-mingw32-gcc && make full;"
                                                                        . "cd ~;"
                                                                        . "sh start64.sh \\\"cd oberon/mingw/voc &&"
-                                                                                         . "src/tools/make/getbranch $branch &&"
+                                                                                         . "src/tools/make/getbranch.sh $branch &&"
                                                                                          . "export CC=x86_64-w64-mingw32-gcc && make full;\\\""],
   "android" => ['-p8022 root@and', "",     "vishap/voc",                 "export CC=gcc && make full"],
   "lub64"   => ['dave@vim',        "sudo", "oberon/voc",                 "make full"],
@@ -62,7 +62,7 @@ unlink glob "log/*";
 
 for my $machine (sort keys %machines) {
   my ($login, $sudo, $dir, $mkcmd) = @{$machines{$machine}};
-  my $cmd = "ssh $login \"cd $dir && src/tools/make/getbranch $branch && $sudo $mkcmd\" ";
+  my $cmd = "ssh $login \"cd $dir && git checkout -f && perl src/tools/make/getbranch.sh $branch && $sudo $mkcmd\" ";
   logged($cmd, $machine);
 }
 
diff --git a/src/tools/make/getbranch.pl b/src/tools/make/getbranch.pl
deleted file mode 100644
index 32ff1927..00000000
--- a/src/tools/make/getbranch.pl
+++ /dev/null
@@ -1,14 +0,0 @@
-#!perl -w
-use strict;
-use warnings;
-
-# Exit with a clean enlistrment in the named branch.
-
-my $branch = "master";
-if (defined($ARGV[0]) && ($ARGV[0] ne "")) {$branch = $ARGV[0]}
-
-set -x
-git reset --hard        # Clear the staging area
-git clean -dfx          # Remove all untracked files
-git pull                # Update the local repository
-git checkout -f $branch # Switch to requested branch
diff --git a/src/tools/make/getbranch.sh b/src/tools/make/getbranch.sh
new file mode 100644
index 00000000..dc3b3ef4
--- /dev/null
+++ b/src/tools/make/getbranch.sh
@@ -0,0 +1,5 @@
+set -x
+git reset --hard    # Clear the staging area
+git clean -dfx      # Remove all untracked files
+git pull            # Update the local repository
+git checkout -f $1  # Switch to requested branch