normalize 'your-*' PKGBUILDs and install hook messages

2 files changed, 25 insertions, 34 deletions

diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD
index dbec24487..fdbc0aa13 100644
--- a/libre/your-freedom/PKGBUILD
+++ b/libre/your-freedom/PKGBUILD
@@ -16,13 +16,13 @@ pkgver=20220508
 _gitver=c3a0d49f9f95503ed41feed32efbfd8b38401852
 pkgrel=1
 pkgdesc="This meta-package conflicts with every known non-free Arch package, to ensure that your system is libre"
-license=(GPL3)
-url=https://wiki.parabola.nu/Blacklist
 arch=(any)
+url=https://wiki.parabola.nu/Blacklist
+license=(GPL3)
 
 makedepends=(librelib)
 install=${pkgname}.install
-source=(blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})
+source=(${pkgname}-blacklist-${_gitver}.txt::https://git.parabola.nu/blacklist.git/plain/blacklist.txt?id=${_gitver})
 
 sha256sums=('53e27f1b6ef1042e2377a710b5faf8edfa4a63efeee082702dac15aa1cb1e550')
 
@@ -34,5 +34,5 @@ package()
   conflicts=( $( libreblacklist normalize < blacklist-${_gitver}.txt | \
                  cut -d: -f1,2 | sed -n 's/:$//p' | sort -u          ) )
 
-  install -Dm644 blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt
+  install -Dm644 ${pkgname}-blacklist-${_gitver}.txt "${pkgdir}"/usr/share/doc/${pkgname}/blacklist.txt
 }
diff --git a/libre/your-freedom/your-freedom.install b/libre/your-freedom/your-freedom.install
index 45a76f3f1..34e65626b 100644
--- a/libre/your-freedom/your-freedom.install
+++ b/libre/your-freedom/your-freedom.install
@@ -1,32 +1,23 @@
-
-pre_install() {
-  cat <<EOM
-  == IMPORTANT NOTICE ==
-
-  This package will help you identify nonfree packages that are installed
-  on your system at the time of its installation, as well as protecting
-  you from (accidentally) installing them.
-
-  Also, if any other nonfree package is identified, later updates will ask
-  you for its removal.
-
-  Have in mind that, if you want to retain certain nonfree packages
-  installed on your system, you'll have to remove your-freedom :)
-
-  If you find out any of the following:
-  * Cascade package removal due to nonfree dependencies,
-  * Your-freedom conflicting with a libre package,
-  * Etc.
-
-  Please report back to the Parabola Project on the usual channels:
-  * https://labs.parabola.nu
-  * mailto:assist@lists.parabola.nu
-  * irc://irc.libera.chat/#parabola
-EOM
-}
-
-pre_upgrade() {
-  pre_install
+notice()
+{
+  cat <<EOF
+  The 'your-freedom' package detects other packages on your system,
+  which are known to be non-free or depend on other non-free packages,
+  and protects you from (accidentally) installing those in the future.
+
+  Also, as any other such packages are identified in the future,
+  an updated 'your-freedom' package will prompt you for their removal.
+
+  Your feedback/participation is important. It is _your_ freedom, after all.
+  If you notice any problems caused by this package, or notice some package
+  which does or does not deserve to be guarded, please do start a discussion.
+
+  * Bugs:  https://labs.parabola.nu
+  * Forum: https://forum.parabola.nu
+  * Email: mailto:assist@lists.parabola.nu
+  * Chat:  ircs://irc.libera.chat/#parabola
+EOF
 }
 
-# vim:set ts=2 sw=2 et:
+pre_install() { notice ; }
+pre_upgrade() { notice ; }