From e448cc331a93b9f46ce6cc0e9f094be71c4afb66 Mon Sep 17 00:00:00 2001
From: Bert van der Weerd <bert@stanzabird.nl>
Date: Sat, 5 Feb 2022 23:13:01 +0100
Subject: [PATCH] moved some stuff to the assets folder

---
 Makefile                                    | 31 ++++++++++++---------
 linux.Dockerfile => assets/linux.Dockerfile |  0
 linux.mk => assets/linux.mk                 |  2 +-
 source_release                              |  2 +-
 version                                     |  2 +-
 5 files changed, 21 insertions(+), 16 deletions(-)
 rename linux.Dockerfile => assets/linux.Dockerfile (100%)
 rename linux.mk => assets/linux.mk (94%)

diff --git a/Makefile b/Makefile
index a15dd2c..ae2127e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY : help all clean veryclean fetch prune docker push build docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-fedora34 fedora34 docker-fedora35 fedora35
+.PHONY : help all clean veryclean fetch prune docker push build update docker-debian11 debian11 docker-mint20 mint20 docker-ubuntu20 ubuntu20 docker-ubuntu21 ubuntu21 docker-fedora34 fedora34 docker-fedora35 fedora35
 
 version:=$(shell cat version)
 release:=$(shell cat release)
@@ -74,34 +74,39 @@ work : $(tarball)
 	mkdir work
 	(cd work && tar xf ../$(tarball))
 
+update :
+	@wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version"
+	@wget -q -O source_release "https://gitlab.com/librewolf-community/browser/source/-/raw/main/release"
+	@echo Source version: $(shell cat version)-$(shell cat source_release)
+	@echo Bsys5 release: $(shell cat release)
 
 ## debian11
 docker-debian11 :
-	${MAKE} -f linux.mk distro=debian11 "distro_image=debian:bullseye" docker
+	${MAKE} -f assets/linux.mk distro=debian11 "distro_image=debian:bullseye" docker
 debian11 : work
-	${MAKE} -f linux.mk distro=debian11 build
+	${MAKE} -f assets/linux.mk distro=debian11 build
 ## mint20
 docker-mint20 :
-	${MAKE} -f linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
+	${MAKE} -f assets/linux.mk distro=mint20 "distro_image=linuxmintd/mint20.2-amd64" docker
 mint20 : work
-	${MAKE} -f linux.mk distro=mint20 build
+	${MAKE} -f assets/linux.mk distro=mint20 build
 ## ubuntu20
 docker-ubuntu20 :
-	${MAKE} -f linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker
+	${MAKE} -f assets/linux.mk distro=ubuntu20 "distro_image=ubuntu:20.04" docker
 ubuntu20 : work
-	${MAKE} -f linux.mk distro=ubuntu20 build
+	${MAKE} -f assets/linux.mk distro=ubuntu20 build
 ## ubuntu21
 docker-ubuntu21 :
-	${MAKE} -f linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker
+	${MAKE} -f assets/linux.mk distro=ubuntu21 "distro_image=ubuntu:21.10" docker
 ubuntu21 : work
-	${MAKE} -f linux.mk distro=ubuntu21 build
+	${MAKE} -f assets/linux.mk distro=ubuntu21 build
 ## fedora34
 docker-fedora34 :
-	${MAKE} -f linux.mk distro=fedora34 "distro_image=fedora:34" docker
+	${MAKE} -f assets/linux.mk distro=fedora34 "distro_image=fedora:34" docker
 fedora34 : work
-	${MAKE} -f linux.mk distro=fedora34 build
+	${MAKE} -f assets/linux.mk distro=fedora34 build
 ## fedora35
 docker-fedora35 :
-	${MAKE} -f linux.mk distro=fedora35 "distro_image=fedora:35" docker
+	${MAKE} -f assets/linux.mk distro=fedora35 "distro_image=fedora:35" docker
 fedora35 : work
-	${MAKE} -f linux.mk distro=fedora35 build
+	${MAKE} -f assets/linux.mk distro=fedora35 build
diff --git a/linux.Dockerfile b/assets/linux.Dockerfile
similarity index 100%
rename from linux.Dockerfile
rename to assets/linux.Dockerfile
diff --git a/linux.mk b/assets/linux.mk
similarity index 94%
rename from linux.mk
rename to assets/linux.mk
index 934d12c..6d9cb6b 100644
--- a/linux.mk
+++ b/assets/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)" -t librewolf/bsys5-image-$(distro) - < linux.Dockerfile
+	docker build --build-arg "distro=$(distro_image)" -t librewolf/bsys5-image-$(distro) - < assets/linux.Dockerfile
 
 build : work
 	if [ $(use_docker) = true ]; then \
diff --git a/source_release b/source_release
index 00750ed..b8626c4 100644
--- a/source_release
+++ b/source_release
@@ -1 +1 @@
-3
+4
diff --git a/version b/version
index 0c97cb4..9d8e80a 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-96.0.3
+96.0.3
\ No newline at end of file