From 1fff775fceaa9f5dafb4c1d62275b12545b61711 Mon Sep 17 00:00:00 2001 From: Bert van der Weerd Date: Tue, 8 Feb 2022 11:23:20 +0100 Subject: [PATCH] fixed some bugs found when doing `diff linux.mk macos.mk` --- assets/linux.mk | 2 +- assets/macos.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/linux.mk b/assets/linux.mk index ec33418..c9bf4ec 100644 --- a/assets/linux.mk +++ b/assets/linux.mk @@ -24,6 +24,6 @@ $(outfile) $(outfile).sha256sum : else \ (cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \ fi - cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 librewolf-$(version)-$(release).en-US.$(distro)-x86_64.tar.bz2 + cp -v work/librewolf-$(version)-$(source_release)/obj-x86_64-pc-linux-gnu/dist/librewolf-$(version)-$(source_release).en-US.linux-x86_64.tar.bz2 $(outfile) sha256sum $(outfile) > $(outfile).sha256sum cat $(outfile).sha256sum diff --git a/assets/macos.mk b/assets/macos.mk index 23d0e5d..1820c10 100644 --- a/assets/macos.mk +++ b/assets/macos.mk @@ -9,7 +9,7 @@ source_release:=$(shell cat source_release) use_docker=true -outfile=librewolf-$(version)-$(source_release).en-US.mac.$(arch).dmg +outfile=librewolf-$(version)-$(release).en-US.mac.$(arch).dmg docker : docker build --build-arg "arch=$(arch)" --build-arg "version=$(version)" --build-arg "source_release=$(source_release)" -t librewolf/bsys5-image-macos-$(arch) - < assets/macos.Dockerfile @@ -24,6 +24,6 @@ $(outfile) $(outfile).sha256sum : else \ (cd /work/librewolf-$(version)-$(source_release) && ./mach build && ./mach package) ; \ fi - cp -v work/librewolf-96.0.3-5/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) + cp -v work/librewolf-$(version)-$(source_release)/obj-$(arch)-apple-darwin/dist/librewolf-$(version)-$(source_release).en-US.mac.dmg $(outfile) sha256sum $(outfile) > $(outfile).sha256sum cat $(outfile).sha256sum