From 192f58fef57ac08b2a889e65d5c6bbc1a9ee1939 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Mon, 20 Jun 2022 00:16:06 -0400 Subject: [PATCH] Replace claims of Red Hat support with Fedora, as testing is not done with other Red Hat distributions Former-commit-id: 8b8a719d2ab61fb3071d7977876edb406a6de322 [formerly afe05cf76f9968a6ce4488a10e704d8fff041e97] Former-commit-id: d5e6f980a9f354d2202ae5c9cfa275eca3eb337d --- README.md | 4 ++-- extra/changelog-total | 2 +- package.sh | 6 +++--- share/doc/sshyp/changelog | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 2a60554..ed18273 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ cd sshyp makepkg -si ``` -Pre-built packages exist for Haiku, FreeBSD, Arch Linux, Debian Linux, Red Hat Linux, and Termux. These can be downloaded from the releases page. +Pre-built packages exist for Haiku, FreeBSD, Arch Linux, Debian Linux, Fedora Linux, and Termux. These can be downloaded from the releases page. # Building Since sshyp is written entirely in Python, it doesn't need to be compiled. It does, however, need to be packaged for installation. @@ -66,7 +66,7 @@ Haiku packaging must be done from within Haiku. The AUR version and the packages attatched to the release tags were already packaged using this script. -Currently, the script can create packages for Haiku, FreeBSD, Arch Linux (PKGBUILD), Debian Linux, Red Hat Linux, Termux, and generic. Packaging for other systems coming soon. +Currently, the script can create packages for Haiku, FreeBSD, Arch Linux (PKGBUILD), Debian Linux, Fedora Linux, Termux, and generic. Packaging for other systems coming soon. # Usage Upon initial installation (on both the server and client devices), be sure to run: diff --git a/extra/changelog-total b/extra/changelog-total index 5a8241b..cdb8b47 100755 --- a/extra/changelog-total +++ b/extra/changelog-total @@ -8,7 +8,7 @@ As such, it is being crowned "v1.0.0", and is considered a stable base for futur Features: - sshyp has been modified to run on Haiku, an open-source re-implementation of BeOS - ^ new package formats have been added for Haiku, FreeBSD, and Red Hat distributions (such as Fedora) + ^ new package formats have been added for Haiku, FreeBSD, and Fedora Linux - the entry format has been changed to support entries created in pass/password-store ^ this change requires existing entry libraries to be converted - see the sshyp v1.0.0 release page on GitHub for a conversion script - majorly overhauled visual experience for sshyp diff --git a/package.sh b/package.sh index b2ed627..2c402f6 100755 --- a/package.sh +++ b/package.sh @@ -5,7 +5,7 @@ # NOTE It is recommended to instead use the latest officially packaged and tagged release. echo -e '\nOptions (please enter the number only):' -echo -e '\nPackage Formats:\n\n1. Haiku\n2. Debian\n3. Red Hat\n4. FreeBSD\n5. Termux\n6. Generic (used for PKGBUILD/APKBUILD)' +echo -e '\nPackage Formats:\n\n1. Haiku\n2. Debian&Ubuntu Linux\n3. Fedora Linux\n4. FreeBSD\n5. Termux\n6. Generic (used for PKGBUILD/APKBUILD)' echo -e '\nBuild Scripts:\n\n7. Arch Linux (PKGBUILD)' echo -e '\nOther:\n\n8. All (generates all distribution packages (excluding Haiku, as this must be done on Haiku) and build scripts)\n' read -n 1 -r -p "Distribution: " distro @@ -136,7 +136,7 @@ if [ "$distro" == "3" ] || [ "$distro" == "4" ] || [ "$distro" == "6" ] || [ "$d fi if [ "$distro" == "3" ] || [ "$distro" == "8" ]; then - echo -e '\nPackaging for Red Hat...\n' + echo -e '\nPackaging for Fedora...\n' rm -rf ~/rpmbuild rpmdev-setuptree cp packages/sshyp-"$version".tar.xz ~/rpmbuild/SOURCES @@ -170,7 +170,7 @@ cp -r %{_sourcedir}/usr %{buildroot} rpmbuild -bb ~/rpmbuild/SPECS/sshyp.spec mv ~/rpmbuild/RPMS/noarch/* packages/ rm -rf ~/rpmbuild -echo -e "\nRed Hat packaging complete.\n" +echo -e "\nFedora packaging complete.\n" fi if [ "$distro" == "4" ] || [ "$distro" == "8" ]; then diff --git a/share/doc/sshyp/changelog b/share/doc/sshyp/changelog index 69fed08..1b57f8b 100644 --- a/share/doc/sshyp/changelog +++ b/share/doc/sshyp/changelog @@ -8,7 +8,7 @@ As such, it is being crowned "v1.0.0", and is considered a stable base for futur Features: - sshyp has been modified to run on Haiku, an open-source re-implementation of BeOS - ^ new package formats have been added for Haiku, FreeBSD, and Red Hat distributions (such as Fedora) + ^ new package formats have been added for Haiku, FreeBSD, and Fedora Linux - the entry format has been changed to support entries created in pass/password-store ^ this change requires existing entry libraries to be converted - see the sshyp v1.0.0 release page on GitHub for a conversion script - majorly overhauled visual experience for sshyp