From d706bb44528f39a2ec6e16f761ba31d870be7f52 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Fri, 14 Apr 2023 12:08:03 -0400
Subject: [PATCH] port-jobs: Added comment/PORT comment removal script

Former-commit-id: 7dd83192d82c4c3a059b50fd6fd51f8a42d381ec
Former-commit-id: c789f40d10eee7efec8818cdae89e8edb252d7a1
---
 package.sh            |  9 +++++++--
 port-jobs/COMMENTS.py | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100755 port-jobs/COMMENTS.py

diff --git a/package.sh b/package.sh
index 7c7a39d..43fc01c 100755
--- a/package.sh
+++ b/package.sh
@@ -8,7 +8,7 @@ else
 fi
 
 _create_generic_all() {
-    printf '\npackaging as generic (multi-platform)...\n'
+    printf '\npackaging as generic (multi-platform/archival, no port jobs)...\n'
     mkdir -p output/generictemp/usr/bin \
          output/generictemp/usr/lib/sshyp/extensions \
          output/generictemp/usr/share/man/man1 \
@@ -23,7 +23,7 @@ _create_generic_all() {
     gzip output/generictemp/usr/share/man/man1/sshyp.1
     XZ_OPT=-e6 tar -C output/generictemp -cvJf output/GENERIC-ALL-sshyp-"$version".tar.xz usr/
     rm -rf output/generictemp
-    printf '\ngeneric (multi-platform) packaging complete\n\n'
+    printf '\ngeneric (multi-platform/archival, no port jobs) packaging complete\n\n'
 } &&
 
 _create_generic_linux() {
@@ -37,6 +37,7 @@ _create_generic_linux() {
 	cp -r lib/. port-jobs/working/
 	cd port-jobs
 	./CLIPBOARD.py LINUX
+	./COMMENTS.py ALL
 	cd ..
     cp -r port-jobs/working/. output/linuxtemp/usr/lib/sshyp/
     # END PORT
@@ -143,6 +144,7 @@ urls {
 	cp -r lib/. port-jobs/working/
 	cd port-jobs
 	./CLIPBOARD.py HAIKU
+	./COMMENTS.py ALL
 	cd ..
     cp -r port-jobs/working/. output/haikutemp/lib/sshyp/
     # END PORT
@@ -187,6 +189,7 @@ Installed-Size: 14584
 	cp -r lib/. port-jobs/working/
 	cd port-jobs
 	./CLIPBOARD.py LINUX
+	./COMMENTS.py ALL
 	cd ..
     cp -r port-jobs/working/. output/debiantemp/sshyp_"$version"-"$revision"_all/usr/lib/sshyp/
     # END PORT
@@ -225,6 +228,7 @@ Installed-Size: 14584
 	cp -r lib/. port-jobs/working/
 	cd port-jobs
 	./CLIPBOARD.py TERMUX
+	./COMMENTS.py ALL
 	cd ..
     cp -r port-jobs/working/. output/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/lib/sshyp/
     # END PORT
@@ -322,6 +326,7 @@ printf "/usr/bin/sshyp
 	cp -r lib/. port-jobs/working/
 	cd port-jobs
 	./CLIPBOARD.py TERMUX
+	./COMMENTS.py ALL
 	cd ..
     cp -r port-jobs/working/. output/freebsdtemp/usr/lib/sshyp/
     # END PORT
diff --git a/port-jobs/COMMENTS.py b/port-jobs/COMMENTS.py
new file mode 100755
index 0000000..cbfb539
--- /dev/null
+++ b/port-jobs/COMMENTS.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+import re
+from sys import argv
+
+# read arguments
+arguments = argv[1:]
+
+# define regular expression depending on arguments
+if arguments[0] == 'ALL':
+    regex = re.compile(r'^\s*#.*$\n?', re.MULTILINE)
+else:
+    regex = re.compile(r'^\s*# PORT.*$\n?', re.MULTILINE)
+
+# read input file
+text = open("working/sshyp.py", "r").read()
+
+# run the defined regular expression
+new_text = re.sub(regex, '', text)
+
+# write the updated text
+open("working/sshyp.py", "w").write(new_text)