mkpk

чување 30adbd4cacc2c8a6287575bacab54eeaafbc4bc6
родитељ e14861b411a545555c185e755c74386e45a86c8a
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Tue, 30 Aug 2022 21:35:06 +0200

Add SRCTOTARBALLS, SKIPCLEAN

Signed-off-by: Страхиња Радић <contact@strahinja.org>

Diffstat:
M
lib/package.mk
 | 
12
++++++++++--
M
mkpk.8
 | 
9
+++++++++

измењених датотека: 2, додавања: 19(+), брисања: 2(-)
diff --git a/lib/package.mk b/lib/package.mk
@@ -15,8 +15,10 @@ package:QV:
 	printf "  MV\t%s\n" $PKG.tar.xz
 	mv pkgroot/$PKG.tar.xz .
 	"$SHA512SUM" $PKG.tar.xz > $PKG.sha512
-	printf "  RM\t%s\n" pkgroot
-	rm -rf pkgroot
+	if [ "$SKIPCLEAN" -ne 1 ]; then
+		printf "  RM\t%s\n" pkgroot
+		rm -rf pkgroot
+	fi
 
 package-install:QV: package
 	printf "  INST\t%s\n" $PKG.tar.xz
@@ -31,6 +33,7 @@ package-fetch:QV:
 	exdirs=$SRCEXDIRS
 	todirs=$SRCTODIRS
 	crdirs=$SRCCRDIRS
+	totarballs=$SRCTOTARBALLS
 	for srctarball in $SRCTARBALLS; do
 		currentsum=${sums%% *}
 		sums=${sums#* }
@@ -42,6 +45,8 @@ package-fetch:QV:
 		todirs=${todirs#* }
 		currentcrdir=${crdirs%% *}
 		crdirs=${crdirs#* }
+		curtotarball=${totarballs%% *}
+		totarballs=${totarballs#* }
 		tbfile="${srctarball##*/}"
 		if [ -n "$currenttodir" ] && [ -d "$SRCPKGDIR/$currenttodir" ]
 		then
@@ -50,6 +55,9 @@ package-fetch:QV:
 		then
 			continue
 		fi
+		if [ -n "$curtotarball" ]; then
+			tbfile=$curtotarball
+		fi
 		if [ ! -e "$SRCPKGDIR/$tbfile" ]; then
 			printf "  CURL\t%s\n" "$tbfile"
 			$CURL -L "$srctarball" > "$SRCPKGDIR/$tbfile"
diff --git a/mkpk.8 b/mkpk.8
@@ -104,6 +104,11 @@ Package database; TSV file holding the names, versions and installation
 timestamps of all installed packages. By default,
 .Pa /pkg/pkgdb.tsv .
 .
+.It Ev SKIPCLEAN
+If set to 1,
+.Pa pkgroot
+won't be deleted after creating a package.
+.
 .It Ev SRCBASEDIR
 Base directory for source code. Defaults to
 .Pa /src .
@@ -135,6 +140,10 @@ which the directories from
 .Ev SRCDIRS
 will be renamed after extracting source archives.
 .
+.It Ev SRCTOTARBALLS
+Space-separated list of tarball names to which the tarballs will be saved.
+Useful eg. for Github tarballs which have only version in their name.
+.
 .It Ev SRCMKFILES
 Directory containing mkfiles. By default,
 .Pa /src/mkfiles .