From 27d4a9dc0bd3baf09c6756d91bb6b21f8c76bbe1 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 5 Feb 2022 00:38:22 +0100
Subject: [PATCH] bugfixes

---
 linux.Dockerfile | 9 +++++----
 linux.mk         | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/linux.Dockerfile b/linux.Dockerfile
index 4307aa3..91b3e4e 100644
--- a/linux.Dockerfile
+++ b/linux.Dockerfile
@@ -1,8 +1,9 @@
-ARG version
-ARG source_release
 ARG distro
 FROM $distro
 
+ENV version         96.0.3
+ENV source_release  3
+
 # dependencies needed to run ./mach bootstrap
 RUN ( apt-get -y update && apt-get -y upgrade && apt-get -y install mercurial python3 python3-dev python3-pip wget ; true)
 RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; true)
@@ -11,9 +12,9 @@ RUN ( dnf -y upgrade && dnf -y install mercurial python3 python3-devel wget ; tr
 RUN mkdir /bootstrap
 WORKDIR /bootstrap
 # setup wasi
-RUN ( export target_wasi_location=$HOME/.mozbuild/wrlb/ && wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/wasi-sdk-14.0-linux.tar.gz && tar xf wasi-sdk-14.0-linux.tar.gz && mkdir -p $target_wasi_location && rm -rf $target_wasi_location/wasi-sysroot && cp -vr wasi-sdk-14.0/share/wasi-sysroot $target_wasi_location && rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* )
+RUN ( export target_wasi_location=$HOME/.mozbuild/wrlb/ && wget -q https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-14/wasi-sdk-14.0-linux.tar.gz && tar xf wasi-sdk-14.0-linux.tar.gz && mkdir -p $target_wasi_location && rm -rf $target_wasi_location/wasi-sysroot && cp -r wasi-sdk-14.0/share/wasi-sysroot $target_wasi_location && rm -f wasi-sdk-*.tar.gz* && rm -rf wasi-sdk-* )
 # run the bootstrap
-RUN ( wget -q -O librewolf-$version-$source_release.source.tar.gz "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build" && tar xf librewolf-$version-$source_release.source.tar.gz && cd librewolf-$version && MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && cd .. && rm -rf librewolf-$version )
+RUN ( wget -q -O librewolf-$version-$source_release.source.tar.gz https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$version-$source_release.source.tar.gz?job=Build && tar xf librewolf-$version-$source_release.source.tar.gz && cd librewolf-$version && MOZBUILD_STATE_PATH=$HOME/.mozbuild ./mach --no-interactive bootstrap --application-choice=browser && . /root/.cargo/env && cargo install cbindgen && cd .. && rm -rf librewolf-$version )
 
 # our work happens here, on the host filesystem.
 WORKDIR /work
diff --git a/linux.mk b/linux.mk
index f3368fc..934d12c 100644
--- a/linux.mk
+++ b/linux.mk
@@ -13,7 +13,7 @@ use_docker=true
 outfile=librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2
 
 docker :
-	docker build --build-arg "distro=$(distro_image)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile
+	docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile
 
 build : work
 	if [ $(use_docker) = true ]; then \