mkpk

чување ad4e7559d0f88eeae2a8f885ee9d6b07e9bf1ce4
родитељ deaaad9e20bd8af40cc2d1fc71410bb2dc7718fd
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Mon, 17 Apr 2023 15:02:21 +0200

lib/*.mk: Fix \t not being expanded by shell (printf does expand it)

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

Diffstat:
M
lib/info.mk
 | 
3
++-
M
lib/install.mk
 | 
3
++-
M
lib/listfiles.mk
 | 
3
++-
M
lib/package.mk
 | 
7
++++---
M
lib/uninstall.mk
 | 
3
++-

измењених датотека: 5, додавања: 12(+), брисања: 7(-)
diff --git a/lib/info.mk b/lib/info.mk
@@ -1,7 +1,8 @@
 <$mkpklib/defaults.mk
 
 show-info:QV:
-	record=$(grep "^$PKGBASE\t" "$PKGDB" 2>/dev/null || echo '')
+	record=$(grep $(printf "^%s\t" "$PKGBASE") "$PKGDB" 2>/dev/null \
+		|| echo '')
 	if [ -z "$record" ]; then
 		printf "Package %s is not installed\n" "$PKGBASE" >&2
 		exit 1
diff --git a/lib/install.mk b/lib/install.mk
@@ -6,7 +6,8 @@ install-package:QV:
 	if [ -z "$recentver" ]; then
 		printf "Cannot find package %s\n" "$PKGBASE" >&2
 		exit 1
-	elif [ -n "$(grep "^$PKGBASE\t" "$PKGDB" 2>/dev/null)" ]; then
+	elif [ -n "$(grep $(printf "^%s\t" "$PKGBASE") "$PKGDB" 2>/dev/null \
+		|| echo '')" ]; then
 		printf "Package %s already installed\n" "$PKGBASE" >&2
 		exit 1
 	else
diff --git a/lib/listfiles.mk b/lib/listfiles.mk
@@ -1,7 +1,8 @@
 <$mkpklib/defaults.mk
 
 listfiles:QV:
-	record=$(grep "^$PKGBASE\t" "$PKGDB" 2>/dev/null || echo '')
+	record=$(grep $(printf "^%s\t" "$PKGBASE") "$PKGDB" 2>/dev/null \
+		|| echo '')
 	if [ -z "$record" ]; then
 		printf "Package %s is not installed\n" "$PKGBASE" >&2
 		exit 1
diff --git a/lib/package.mk b/lib/package.mk
@@ -9,9 +9,10 @@ package:QV:
 	printf "  MK\t%s\n" "DESTDIR=pkgroot install"
 	"$MK" DESTDIR=pkgroot install
 	printf "  PROOT\t%s\n" pkgroot
-	"$PROOT" -r pkgroot -0 -b /bin/tar -b /bin/xz $BINDDIRS -w / tar -cJnf \
-		$PKG.tar.xz $(cd pkgroot; find . | sort | uniq | \
-			sed 's,^\./,,;s,^\.$,,')
+	(cd pkgroot; find . -printf "%p\n" | sort | uniq \
+		| sed 's,^\./,,;s,^\.$,,' > filelist)
+	"$PROOT" -r pkgroot -0 -b /bin/tar -b /bin/xz $BINDDIRS -w / \
+		tar -cJnf -T filelist $PKG.tar.xz
 	printf "  MV\t%s\n" $PKG.tar.xz
 	mv pkgroot/$PKG.tar.xz .
 	"$SHA512SUM" $PKG.tar.xz > $PKG.sha512
diff --git a/lib/uninstall.mk b/lib/uninstall.mk
@@ -1,7 +1,8 @@
 <$mkpklib/defaults.mk
 
 uninstall-package:QV:
-	record=$(grep "^$PKGBASE\t" "$PKGDB" 2>/dev/null || echo '')
+	record=$(grep $(printf "^%s\t" "$PKGBASE") "$PKGDB" 2>/dev/null \
+		|| echo '')
 	if [ -z "$record" ]; then
 		printf "Package %s is not installed\n" "$PKGBASE" >&2
 		exit 1