mkpk

чување 4af5a8a9686a65b06c710863f26826b601a3f2b6
родитељ ba523f993a5c139e15b0e1c2ca000eea10129bef
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Sun,  7 Aug 2022 15:59:23 +0200

Merge branch 'master' of git.sr.ht:~strahinja/mkpk

Diffstat:
M
lib/defaults.mk
 | 
1
+
M
lib/package.mk
 | 
9
+++++----

измењених датотека: 2, додавања: 6(+), брисања: 4(-)
diff --git a/lib/defaults.mk b/lib/defaults.mk
@@ -10,6 +10,7 @@ MANDIR=		$DESTDIR$PREFIX/share/man
 MKFILESREPO=	https://git.sr.ht/~strahinja/galeb-mkfiles
 PKGDIR=		/pkg
 SRCBASEDIR=	/src
+SRCPKGDIR=	$SRCBASEDIR/pkg
 SRCMKFILES=	$SRCBASEDIR/mkfiles
 PKGDB=		$PKGDIR/pkgdb.tsv
 
diff --git a/lib/package.mk b/lib/package.mk
@@ -26,12 +26,13 @@ package-fetch:QV:
 		currentsum=${sums%% *}
 		sums=${sums#* }
 		tbfile="${srctarball##*/}"
-		if [ ! -e "$tbfile" ]; then
+		if [ ! -e "$SRCPKGDIR/$tbfile" ]; then
 			printf "  CURL\t%s\n" "$tbfile"
-			$CURL "$srctarball" > "$tbfile"
+			$CURL "$srctarball" > "$SRCPKGDIR/$tbfile"
 			if [ -n "$currentsum" ]; then
 				printf "  SHA\t%s %s\n" -c "$tbfile"
-				if ! printf "%s  %s\n" $currentsum \
+				if ! printf "%s  %s/%s\n" $currentsum \
+					$SRCPKGDIR \
 					${tbfile##*/} | $SHA512SUM -c -; then
 					printf "Checksum mismatch in %s\n" \
 						${tbfile##*/} >&2
@@ -39,7 +40,7 @@ package-fetch:QV:
 				fi
 			fi
 			printf "  TAR\t%s\n" "$tbfile"
-			xz -dc "$tbfile" | $TAR -xf -
+			xz -dc "$SRCPKGDIR/$tbfile" | $TAR -xf -
 		fi
 	done
 	for srcrepo in $SRCREPOS; do