From 2aed9e7b999fb8bb382b008ab2bf6e1e0bb15a92 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Thu, 30 Sep 2021 01:22:31 +0200
Subject: [PATCH] fixes

---
 build.py                           |  1 +
 docker/Makefile                    | 34 ++++++++++++++++++------------
 docker/built-image/Dockerfile      |  0
 docker/built-image/Makefile        |  2 --
 docker/fetched-image/Dockerfile    |  9 --------
 docker/fetched-image/Makefile      |  2 --
 docker/librewolf/debian/Dockerfile | 27 +++++++++++++-----------
 7 files changed, 37 insertions(+), 38 deletions(-)
 delete mode 100644 docker/built-image/Dockerfile
 delete mode 100644 docker/built-image/Makefile
 delete mode 100644 docker/fetched-image/Dockerfile
 delete mode 100644 docker/fetched-image/Makefile

diff --git a/build.py b/build.py
index 4480721..a23bb3a 100755
--- a/build.py
+++ b/build.py
@@ -84,6 +84,7 @@ def leave_srcdir():
         
 def exec(cmd):
     if cmd != '':
+        cmd = 'bash -c "{}"'.format(cmd)
         print(cmd)
         if not options.no_execute:
                 retval = os.system(cmd)
diff --git a/docker/Makefile b/docker/Makefile
index 875a7cb..c70c3a9 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,23 +1,31 @@
-all :
-	cp version release && cp version librewolf && cp version fetched-image
-
-	make -C buildenv
-	make -C fetched-image
-	make -C librewolf
+all : lw
+# for working with the original mozilla source:
+# all : mozilla
 
 clean :
-	rm -f librewolf/version release/version fetched-image/version
+	rm -f librewolf/version release/version
 
 	make -C librewolf clean
 	make -C release clean
 
+lw :
+	cp version librewolf
+
+	make -C buildenv
+	make -C librewolf
+
+mozilla :
+	cp version release
+
+	make -C buildenv
+	make -C nightly
+	make -C release
+
 prune :
 	sudo docker system prune --all --force
 
-mozilla :
-	cp version release && cp version librewolf && cp version fetched-image
+full : prune lw mozilla
+
+help :
+	@echo "Use: make all help clean lw prune mozilla full"
 
-	make -C buildenv
-	make -C fetched-image
-	make -C nightly
-	make -C release
diff --git a/docker/built-image/Dockerfile b/docker/built-image/Dockerfile
deleted file mode 100644
index e69de29..0000000
diff --git a/docker/built-image/Makefile b/docker/built-image/Makefile
deleted file mode 100644
index 94ede27..0000000
--- a/docker/built-image/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-all :
-	sudo docker build -t librewolf/built-image .
diff --git a/docker/fetched-image/Dockerfile b/docker/fetched-image/Dockerfile
deleted file mode 100644
index 39dc847..0000000
--- a/docker/fetched-image/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-from mozilla/buildenv-debian
-run rm -rf mozilla-unified
-
-# Build it..
-copy version /
-run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
-run tar xf firefox-$(cat /version).source.tar.xz
-run ln -s firefox-$(cat /version) work
-workdir work
diff --git a/docker/fetched-image/Makefile b/docker/fetched-image/Makefile
deleted file mode 100644
index 2bb26c3..0000000
--- a/docker/fetched-image/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-all :
-	sudo docker build -t librewolf/fetched-image .
diff --git a/docker/librewolf/debian/Dockerfile b/docker/librewolf/debian/Dockerfile
index 3648453..873b4dc 100644
--- a/docker/librewolf/debian/Dockerfile
+++ b/docker/librewolf/debian/Dockerfile
@@ -1,17 +1,20 @@
-from librewolf/fetched-image
+from mozilla/buildenv-debian
+run rm -rf mozilla-unified
+
+# Build it..
+copy version /
+run wget -q https://archive.mozilla.org/pub/firefox/releases/$(cat /version)/source/firefox-$(cat /version).source.tar.xz
+run tar xf firefox-$(cat /version).source.tar.xz
+
 # dependencies
 run apt-get install -y git
-
-workdir /
+run #### [build trigger] (add or remove a few hashes in front to build from here)
 run git clone --recursive https://gitlab.com/librewolf-community/browser/windows.git
 workdir windows
 run ln -s /firefox-$(cat /version)
-run ls -l
-run pwd
-run ls -l /
-run python3 build.py --version $(cat /version) fetch
-run python3 build.py lw_do_patches
-run python3 build.py build
-run python3 build.py lw_post_build
-run python3 build.py package
-run python3 build.py lw_artifacts
+
+run ./build.py --version $(cat /version) lw_do_patches
+run ./build.py --version $(cat /version) build
+run ./build.py --version $(cat /version) lw_post_build
+run ./build.py --version $(cat /version) package
+run ./build.py --version $(cat /version) lw_artifacts