wmgen

чување 312db27099b896855330956ad9260eb277500398
родитељ cf6b8181bf80319808a3bd69fa607cc34f13c61e
Аутор: Страхиња Радић <sr@strahinja.org>
Датум:   Mon,  8 Jul 2024 16:53:51 +0200

lib/mkpack: Copy from sled; Makefile(pack): Update target to use 
lib/mkpack; pack.sh: Remove file

Diffstat:
M
Makefile
 | 
2
+-
A
lib/mkpack
 | 
20
++++++++++++++++++++
D
pack.sh
 | 
11
-----------

измењених датотека: 3, додавања: 21(+), брисања: 12(-)
diff --git a/Makefile b/Makefile
@@ -46,6 +46,6 @@ uninstall:
 	rmdir $(MANPREFIX)/man1 2>/dev/null || true
 
 pack:
-	sh pack.sh
+	sh -x lib/mkpack
 
 .PHONY: all clean install pack uninstall
diff --git a/lib/mkpack b/lib/mkpack
@@ -0,0 +1,20 @@
+#!/bin/sh -x
+# vim: set ft=bash:
+DISTDIR=$(grep '^PROG[[:space:]]\{1,\}=' config.mk |
+	sed -E 's,.*=[[:space:]]+([[:alpha:]]+),\1,')-$(cat version)
+mkdir "$DISTDIR"
+if [ -d .got ] && command -v got >/dev/null 2>&1; then
+	files=$(got tree | sed -e 's,[@/*$]$,,g')
+elif [ -d .git ] && command -v git >/dev/null 2>&1; then
+	files=$(git ls-files)
+else
+	printf "Either got or git are required for 'make pack'\n" >&2
+	exit 1
+fi
+for f in $files; do
+	d="$DISTDIR"/"$(dirname "$f")"
+	mkdir -p "$d"
+	cp "$f" "$d"/
+done
+tar -cf - "$DISTDIR" | xz -9v - > "$DISTDIR".tar.xz
+rm -fr "$DISTDIR"
diff --git a/pack.sh b/pack.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-# vim: set ft=bash:
-set -x
-distdir=wmgen-$(git describe | sed 's/^v//')
-for f in $(git ls-files); do
-	d=$distdir/$(dirname "$f")
-	mkdir -p "$d"
-	cp "$f" "$d"
-done
-tar cvf "$distdir".tar.xz "$distdir" >/dev/null
-rm -fr "$distdir"