mkpk

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

Improve fetch logic; add SRCTODIRS

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

Diffstat:
M
lib/package.mk
 | 
25
+++++++++++++++++++++----

измењених датотека: 1, додавања: 21(+), брисања: 4(-)
diff --git a/lib/package.mk b/lib/package.mk
@@ -21,11 +21,23 @@ package-install:QV: package
 
 package-fetch:QV:
 	cd "$SRCBASEDIR"
-	sums=${SHA512SUMS}
+	sums=$SHA512SUMS
+	dirs=$SRCDIRS
 	for srctarball in $SRCTARBALLS; do
 		currentsum=${sums%% *}
 		sums=${sums#* }
+		currentdir=${dirs%% *}
+		dirs=${dirs#* }
+		currenttodir=${todirs%% *}
+		todirs=${todirs#* }
 		tbfile="${srctarball##*/}"
+		if [ -n "$currenttodir"] && [ -d "$SRCPKGDIR/$currenttodir" ]
+		then
+			continue
+		elif [ -n "$currentdir" ] && [ -d "$SRCPKGDIR/$currentdir" ]
+		then
+			continue
+		fi
 		if [ ! -e "$SRCPKGDIR/$tbfile" ]; then
 			printf "  CURL\t%s\n" "$tbfile"
 			$CURL "$srctarball" > "$SRCPKGDIR/$tbfile"
@@ -33,14 +45,19 @@ package-fetch:QV:
 				printf "  SHA\t%s %s\n" -c "$tbfile"
 				if ! printf "%s  %s/%s\n" $currentsum \
 					$SRCPKGDIR \
-					${tbfile##*/} | $SHA512SUM -c -; then
+					${tbfile##*/} | $SHA512SUM -c -
+				then
 					printf "Checksum mismatch in %s\n" \
 						${tbfile##*/} >&2
 					exit 1
 				fi
 			fi
-			printf "  TAR\t%s\n" "$tbfile"
-			xz -dc "$SRCPKGDIR/$tbfile" | $TAR -xf -
+		fi
+		printf "  TAR\t%s\n" "$tbfile"
+		xz -dc "$SRCPKGDIR/$tbfile" | $TAR -xf -
+		if [ -n "$currenttodir" ]; then
+			printf "  MV\t%s/%s\n" "$SRCPKGDIR" "$currenttodir"
+			mv "$SRCPKGDIR/$currentdir" "$SRCPKGDIR/$currenttodir"
 		fi
 	done
 	for srcrepo in $SRCREPOS; do