mkpk

чување 84e779fbd584a22fc345a598447c2b3d008daef4
родитељ 13564f48d08d4d27b236f9a10548331a47387b16
Аутор: Страхиња Радић <contact@strahinja.org>
Датум:   Thu,  4 Aug 2022 23:10:06 +0200

Update TODO; silence sha512sum; take into accoutn DESTDIR in DOCDIR and LEGALDIR

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

Diffstat:
M
TODO
 | 
14
++++++++------
M
lib/defaults.mk
 | 
4
++--
M
lib/install.mk
 | 
2
+-

измењених датотека: 3, додавања: 11(+), брисања: 9(-)
diff --git a/TODO b/TODO
@@ -1,6 +1,14 @@
 TODO
 ====
 
+[ ] Handle legal files like the bootstrap scripts
+
+< > Install dependencies (it would call `mk -f $mkpklib/install.mk`)
+    - It would need dependencies db or dependencies file with the mkfiles; maybe
+      just a variable
+
+< > Implement explicitely passing version as a parameter
+
 [x] mkpk fetch
 
 [x] Actually check SHA512 sums when installing
@@ -20,9 +28,3 @@ TODO
     of recent to lib/*.mk
 
 [x] mkpk update
-
-< > Install dependencies (it would call `mk -f $mkpklib/install.mk`)
-    - It would need dependencies db or dependencies file with the mkfiles; maybe
-      just a variable
-
-< > Implement explicitely passing version as a parameter
diff --git a/lib/defaults.mk b/lib/defaults.mk
@@ -4,6 +4,8 @@ PREFIX=		`{ if [ -n "$PREFIX" ]; then echo $PREFIX; \
 BINDIR=		`{ if [ -n "$BINDIR" ] && [ "$ignoreenv" -ne 1 ]; \
 		   then echo $BINDIR; \
 		   else echo $DESTDIR$PREFIX/bin; fi }
+DOCDIR=		$DESTDIR/share/doc/$PKG
+LEGALDIR=	$DESTDIR/share/legal/$PKG
 LIBDIR=		`{ if [ -n "$LIBDIR" ] && [ "$ignoreenv" -ne 1 ]; \
 		   then echo $LIBDIR; \
 		   else echo $DESTDIR$PREFIX/lib; fi }
@@ -11,8 +13,6 @@ MANDIR=		`{ if [ -n "$MANDIR" ] && [ "$ignoreenv" -ne 1 ]; \
 		   then echo $MANDIR; \
 		   else echo $DESTDIR$PREFIX/share/man; fi }
 
-DOCDIR=		/share/doc/$PKG
-LEGALDIR=	/share/legal/$PKG
 MKFILESREPO=	https://git.sr.ht/~strahinja/galeb-mkfiles
 PKGDIR=		/pkg
 SRCBASEDIR=	/src
diff --git a/lib/install.mk b/lib/install.mk
@@ -14,7 +14,7 @@ install-package:QV:
 		sha=$PKGDIR/$PKGBASE-$recentver.sha512
 		cd "$PKGDIR"
 		printf "  SHA512\t%s\n" "$sha"
-		if ! $SHA512SUM -c "$sha"; then
+		if ! $SHA512SUM -c "$sha" >/dev/null 2>&1; then
 			printf "Checksum mismatch in %s\n" "$sha" >&2
 			exit 1
 		fi