From 75071601e6ea8dce10774acd885d13dc1dd5cb79 Mon Sep 17 00:00:00 2001
From: Randall Winkhart <idgr@tutanota.com>
Date: Tue, 21 Jun 2022 23:37:45 -0400
Subject: [PATCH] Update packaging for sshyp.py rename

Former-commit-id: 1f52fb7fb48c7e1152314d065602139f62b5ea2e [formerly 37fe8e37e774e56553c534e9486f9814a08787ad]
Former-commit-id: 8f17c38475e647b511bc7858c3859d3c65e29882
---
 bin/sshyp  |  1 -
 package.sh | 20 +++++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)
 delete mode 120000 bin/sshyp

diff --git a/bin/sshyp b/bin/sshyp
deleted file mode 120000
index 905b9a5..0000000
--- a/bin/sshyp
+++ /dev/null
@@ -1 +0,0 @@
-/usr/bin/sshyp.py
\ No newline at end of file
diff --git a/package.sh b/package.sh
index 70db2ea..6cc35ca 100755
--- a/package.sh
+++ b/package.sh
@@ -62,6 +62,7 @@ urls {
 }
 " > packages/haikutemp/.PackageInfo
     cp -r bin packages/haikutemp/
+    ln -s /bin/sshyp.py packages/haikutemp/bin/sshyp
     cp -r share/doc/sshyp/ packages/haikutemp/documentation/packages/
     cp -r share/licenses/sshyp/ packages/haikutemp/documentation/packages/
     cp extra/manpage packages/haikutemp/documentation/man/man1/sshyp.1
@@ -89,6 +90,7 @@ Priority: optional
 Installed-Size: 185
 " > packages/debiantemp/sshyp_"$version"-"$revision"_all/DEBIAN/control
     cp -r bin packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/
+    ln -s /usr/bin/sshyp.py packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/bin/sshyp
     cp -r share packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/
     cp extra/manpage packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/share/man/man1/sshyp.1
     gzip packages/debiantemp/sshyp_"$version"-"$revision"_all/usr/share/man/man1/sshyp.1
@@ -113,6 +115,7 @@ Priority: optional
 Installed-Size: 185
 " > packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/DEBIAN/control
     cp -r bin packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/
+    ln -s /usr/bin/sshyp.py packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/bin/sshyp
     cp -r share packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/
     cp extra/manpage packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/share/man/man1/sshyp.1
     gzip packages/termuxtemp/sshyp_"$version"-"$revision"_all_termux/data/data/com.termux/files/usr/share/man/man1/sshyp.1
@@ -124,13 +127,14 @@ fi
 
 if [ "$distro" == "3" ] || [ "$distro" == "4" ] || [ "$distro" == "6" ] || [ "$distro" == "7" ] || [ "$distro" == "8" ]; then
     echo -e '\nPackaging as generic...\n'
-    mkdir -p packages/archtemp/usr/share/man/man1
-    cp -r bin packages/archtemp/usr/
-    cp -r share packages/archtemp/usr/
-    cp extra/manpage packages/archtemp/usr/share/man/man1/sshyp.1
-    gzip packages/archtemp/usr/share/man/man1/sshyp.1
-    tar -C packages/archtemp -cvf packages/sshyp-"$version".tar.xz usr/
-    rm -rf packages/archtemp
+    mkdir -p packages/generictemp/usr/share/man/man1
+    cp -r bin packages/generictemp/usr/
+    ln -s /usr/bin/sshyp.py packages/generictemp/usr/bin/sshyp
+    cp -r share packages/generictemp/usr/
+    cp extra/manpage packages/generictemp/usr/share/man/man1/sshyp.1
+    gzip packages/generictemp/usr/share/man/man1/sshyp.1
+    tar -C packages/generictemp -cvf packages/sshyp-"$version".tar.xz usr/
+    rm -rf packages/generictemp
     sha512="$(sha512sum packages/sshyp-"$version".tar.xz | awk '{print $1;}')"
     echo -e "\nsha512 sum:\n$sha512"
     echo -e "\nGeneric packaging complete.\n"
@@ -162,6 +166,7 @@ cp -r %{_sourcedir}/usr %{buildroot}
 
 %files
 /usr/bin/sshyp
+/usr/bin/sshyp.py
 /usr/bin/sshync.py
 /usr/bin/sshypRemote.py
 %license /usr/share/licenses/sshyp/license
@@ -210,6 +215,7 @@ prefix: /
 echo "/bin/python3
 /usr/bin/sshync.py
 /usr/bin/sshyp
+/usr/bin/sshyp.py
 /usr/bin/sshypRemote.py
 /usr/share/doc/sshyp/changelog
 /usr/share/licenses/sshyp/license