From 7813ab38607b82d01becea8d5a9383b5a0f11199 Mon Sep 17 00:00:00 2001
From: Peter Buchegger <peter@pbuchegger.at>
Date: Thu, 16 Jan 2020 15:36:23 +0100
Subject: [PATCH] can run local master config file now with docker

---
 pypy/master/start_buildbot.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pypy/master/start_buildbot.sh b/pypy/master/start_buildbot.sh
index 8bd4f81..710deb9 100755
--- a/pypy/master/start_buildbot.sh
+++ b/pypy/master/start_buildbot.sh
@@ -5,18 +5,21 @@
 # we download the config from an arbitrary curl accessible tar.gz file (which github can generate for us)
 
 B=`pwd`
+BUILDBOT_CONFIG_DIR=${BUILDBOT_CONFIG_DIR:-config}
 
 if [ -z "$BUILDBOT_CONFIG_URL" ]
 then
-    if [ ! -f "$B/master.cfg" ]
+    if [ ! -f "$B/$BUILDBOT_CONFIG_DIR/master.cfg" ]
     then
         echo No master.cfg found nor $$BUILDBOT_CONFIG_URL !
-        echo Please provide a master.cfg file in $B or provide a $$BUILDBOT_CONFIG_URL variable via -e
+        echo Please provide a master.cfg file in $B/$BUILDBOT_CONFIG_DIR or provide a $$BUILDBOT_CONFIG_URL variable via -e
         exit 1
     fi
+fi
 
-else
-    BUILDBOT_CONFIG_DIR=${BUILDBOT_CONFIG_DIR:-config}
+# if config is not downloaded, do it
+if [ -n "$BUILDBOT_CONFIG_URL" ]
+then
     mkdir -p $B/$BUILDBOT_CONFIG_DIR
     # if it ends with .tar.gz then its a tarball, else its directly the file
     if echo "$BUILDBOT_CONFIG_URL" | grep '.tar.gz$' >/dev/null
@@ -26,20 +29,21 @@ else
             echo "Can't download from \$BUILDBOT_CONFIG_URL: $BUILDBOT_CONFIG_URL"
             sleep 1
         done
-
-        ln -sf $B/$BUILDBOT_CONFIG_DIR/master.cfg $B/master.cfg
-
-        if [ -f $B/$BUILDBOT_CONFIG_DIR/buildbot.tac ]
-        then
-            ln -sf $B/$BUILDBOT_CONFIG_DIR/buildbot.tac $B/buildbot.tac
-        fi
     else
-        until curl -sL $BUILDBOT_CONFIG_URL > $B/master.cfg
+        until curl -sL $BUILDBOT_CONFIG_URL > $B/$BUILDBOT_CONFIG_DIR/master.cfg
         do
             echo "Can't download from $$BUILDBOT_CONFIG_URL: $BUILDBOT_CONFIG_URL"
         done
     fi
 fi
+
+# link downloaded/local files
+ln -sf $B/$BUILDBOT_CONFIG_DIR/master.cfg $B/master.cfg
+if [ -f $B/$BUILDBOT_CONFIG_DIR/buildbot.tac ]
+then
+    ln -sf $B/$BUILDBOT_CONFIG_DIR/buildbot.tac $B/buildbot.tac
+fi
+
 # copy the default buildbot.tac if not provided by the config
 if [ ! -f $B/buildbot.tac ]
 then