From a8a873b9582aa86f2ddfe67715b95efb9b086622 Mon Sep 17 00:00:00 2001
From: Cameron Katri <me@cameronkatri.com>
Date: Fri, 14 May 2021 22:47:55 -0400
Subject: create_tarballs.sh: Make it work correctly

---
 create_tarballs.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/create_tarballs.sh b/create_tarballs.sh
index cec2e82..89e1588 100755
--- a/create_tarballs.sh
+++ b/create_tarballs.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
-if command -v bsdtar &>/dev/null; then
+if command -v bsdtar >/dev/null 2>&1; then
 	TAR="bsdtar"
-elif ! tar --version | grep "GNU" &>/dev/null; then
+elif ! tar --version | grep "GNU" >/dev/null 2>&1; then
 	TAR="tar"
 else
 	echo "Install BSD tar"
@@ -15,12 +15,18 @@ for i in adv_cmds basic_cmds bootstrap_cmds \
 		patch_cmds remote_cmds shell_cmds \
 		system_cmds text_cmds; do
 	EXTRA_PATHS=""
-	TARFLAGS="caf"
+	REGEX=""
 	case "$i" in
-		network_cmds) TARFLAGS="-s '|^|network_cmds/|' -caf" EXTRA_PATHS="lib/libpcap";;
-		remote_cmds) TARFLAGS="-s '|^|remote_cmds/|' -caf" EXTRA_PATHS="lib/libtelnet";;
+		network_cmds) REGEX="|^|network_cmds/|" EXTRA_PATHS="lib/libpcap";;
+		remote_cmds) REGEX="|^|remote_cmds/|" EXTRA_PATHS="lib/libtelnet";;
 	esac
 	num=$((num+1))
 	printf "(%i) %s\n" "$num" "$i"
-	${TAR} ${TARFLAGS} $i.tar.zst $i ${EXTRA_PATHS}
-done
\ No newline at end of file
+	cp setup.sh $i/setup.sh
+	if [ "${REGEX}" == "" ]; then
+		${TAR} -caf $i.tar.zst $i ${EXTRA_PATHS}
+	else
+		${TAR} -s ${REGEX} -caf $i.tar.zst $i ${EXTRA_PATHS}
+	fi
+	rm $i/setup.sh
+done
-- 
cgit v1.2.3-56-ge451