From e0e597ab55c6dc7c3db7accd3be3a472642fa346 Mon Sep 17 00:00:00 2001
From: "Kelvin M. Klann" <kmk3.code@protonmail.com>
Date: Sun, 23 Jul 2023 04:40:11 -0300
Subject: [PATCH] build: make asc use config.sh

Similarly to mkdeb.sh.

Relates to #5140.
---
 Makefile |  4 ++--
 mkasc.sh | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 4551ebad2..6e3593d20 100644
--- a/Makefile
+++ b/Makefile
@@ -339,8 +339,8 @@ dist: clean config.mk
 	rm -fr $(TARNAME)-$(VERSION)
 
 .PHONY: asc
-asc: config.mk
-	./mkasc.sh $(VERSION)
+asc: config.sh
+	./mkasc.sh
 
 .PHONY: deb
 deb: dist config.sh
diff --git a/mkasc.sh b/mkasc.sh
index de9bf9851..62c1b1180 100755
--- a/mkasc.sh
+++ b/mkasc.sh
@@ -3,11 +3,13 @@
 # Copyright (C) 2014-2023 Firejail Authors
 # License GPL v2
 
-echo "Calculating SHA256 for all files in /transfer - firejail version $1"
+. "$(dirname "$0")/config.sh"
+
+printf 'Calculating SHA256 for all files in /transfer - %s version %s' "$TARNAME" "$VERSION"
 
 cd /transfer || exit 1
-sha256sum ./* > "firejail-$1-unsigned"
-gpg --clearsign --digest-algo SHA256 < "firejail-$1-unsigned" > "firejail-$1.asc"
-gpg --verify "firejail-$1.asc"
-gpg --detach-sign --armor "firejail-$1.tar.xz"
-rm "firejail-$1-unsigned"
+sha256sum ./* > "$TARNAME-$VERSION-unsigned"
+gpg --clearsign --digest-algo SHA256 < "$TARNAME-$VERSION-unsigned" > "$TARNAME-$VERSION.asc"
+gpg --verify "$TARNAME-$VERSION.asc"
+gpg --detach-sign --armor "$TARNAME-$VERSION.tar.xz"
+rm "$TARNAME-$VERSION-unsigned"