From b84574958d92055d2e33c26e1f2d43d48c9ed50c Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Mon, 9 Dec 2019 10:28:21 -0600
Subject: [PATCH] 3rdparty/docker/bootstrap: Fix a few potential mis-steps
 during the bootstrap init

Change-Id: I381fd7c00957e9d6797b0a79beacdef981593d3f
---
 3rdparty/docker/bootstrap/Makefile | 4 ++--
 3rdparty/docker/bootstrap/prep.sh  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/3rdparty/docker/bootstrap/Makefile b/3rdparty/docker/bootstrap/Makefile
index 5778206e55..1a42dc9665 100644
--- a/3rdparty/docker/bootstrap/Makefile
+++ b/3rdparty/docker/bootstrap/Makefile
@@ -7,13 +7,13 @@ SOURCES=$(HOME)/Code
 #EXTRA=-v $(SOURCES)/haiku:/work/src/haiku -v $(SOURCES)/buildtools:/work/src/buildtools
 
 default:
-	${ENGINE} build . -t docker.io/haiku/bootstrap
+	${ENGINE} build . --no-cache -t docker.io/haiku/bootstrap
 clean:
 	${ENGINE} ps -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} kill {}
 	${ENGINE} ps -a -q --filter=ancestor=docker.io/haiku/bootstrap | xargs -I {} ${ENGINE} rm {}
 	${ENGINE} volume rm bootstrap_work
 init:
-	${ENGINE} run -v bootstrap_work:/work docker.io/haiku/bootstrap prep
+	${ENGINE} run -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap prep
 crosstools:
 	${ENGINE} run -e TARGET_ARCH=$(TARGET_ARCH) -v bootstrap_work:/work ${EXTRA} docker.io/haiku/bootstrap crosstools
 bootstrap:
diff --git a/3rdparty/docker/bootstrap/prep.sh b/3rdparty/docker/bootstrap/prep.sh
index bf73248263..c91e5cc4cb 100755
--- a/3rdparty/docker/bootstrap/prep.sh
+++ b/3rdparty/docker/bootstrap/prep.sh
@@ -38,9 +38,10 @@ if [ ! -d $WORKPATH/src/haiku ]; then
 	git clone $GIT_HAIKU $WORKPATH/src/haiku
 fi
 
-mkdir $WORKPATH/bin
+mkdir -p $WORKPATH/bin
 if [ ! -f $WORKPATH/bin/jam ]; then
 	cd $WORKPATH/src/buildtools/jam
+	rm -rf bin.*
 	make
 	cp -f bin.linuxx86/jam $WORKPATH/bin/jam
 	cd -