diff --git a/bin/sshyp.py b/bin/sshyp.py index 1ee56ee..15b4e3b 100755 --- a/bin/sshyp.py +++ b/bin/sshyp.py @@ -355,12 +355,11 @@ def print_info(): # prints help text based on argument print('\u001b[38;5;7;48;5;8m<><><><><><><><><><><><><><><><><><><><><><><><><><><><>\u001b[0m\n') print('see https://github.com/rwinkhart/sshyp for more information\n') elif argument_list[1] == 'license': - print('\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU ' - 'General\nPublic License as published by the Free Software Foundation, either version 3 of the License,' - '\nor (at your option) any later version.\n\nThis program is distributed in the hope that it will be ' - 'useful, but WITHOUT ANY WARRANTY;\nwithout even the implied warranty of MERCHANTABILITY or FITNESS FOR A' - ' PARTICULAR PURPOSE.\nSee the GNU General Public License for more details.' - '\n\nhttps://opensource.org/licenses/GPL-3.0\n') + print('\nThis program is free software: you can redistribute it and/or modify it under the terms\nof version 3 ' + '(only) of the GNU General Public License as published by the Free Software Foundation.\n\nThis program ' + 'is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;\nwithout even the implied ' + 'warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\nSee the GNU General Public License for' + ' more details.\n\nhttps://opensource.org/licenses/GPL-3.0\n') elif argument_list[1] == 'add': print('\n\u001b[1musage:\u001b[0m sshyp add [flag []]\u001b[0m\n') print('\u001b[1mflags:\u001b[0m') diff --git a/package.sh b/package.sh index def8825..00ae96c 100755 --- a/package.sh +++ b/package.sh @@ -33,7 +33,7 @@ pkgrel="$revision" pkgdesc='A light-weight, self-hosted, synchronized password manager' url='https://github.com/rwinkhart/sshyp' arch=('any') -license=('GPL3') +license=('GPL-3.0-only') depends=(python gnupg openssh xclip wl-clipboard) source=(\""$source"\") sha512sums=('"$sha512"') @@ -55,7 +55,7 @@ pkgdesc='A light-weight, self-hosted, synchronized password manager' options=!check url='https://github.com/rwinkhart/sshyp' arch='noarch' -license='GPL-3.0-or-later' +license='GPL-3.0-only' depends='python3 gnupg openssh xclip wl-clipboard' source=\""$source"\" @@ -82,7 +82,7 @@ description \"sshyp is the only password-store compatible CLI password manager packager \"Randall Winkhart \" vendor \"Randall Winkhart\" licenses { - \"GNU GPL v3\" + \"GPL-3.0-only\" } copyrights { \"2021-2022 Randall Winkhart\" @@ -179,7 +179,7 @@ Version: "$version" Release: "$revision" Summary: A light-weight, self-hosted, synchronized password manager BuildArch: noarch -License: GPLv3 +License: GPL-3.0-only URL: https://github.com/rwinkhart/sshyp Source0: sshyp-"$version".tar.xz Requires: python gnupg openssh wl-clipboard diff --git a/share/licenses/sshyp/license b/share/licenses/sshyp/license index f136a5f..9f8ca3f 100755 --- a/share/licenses/sshyp/license +++ b/share/licenses/sshyp/license @@ -2,9 +2,8 @@ Copyright (C) 2022 Randall Winkhart idgr@tutanota.com This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. + it under the terms of version 3 (only) of the GNU General Public License + as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,4 +11,4 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see .