make engimail optional and fix naming

2 files changed, 10 insertions, 9 deletions

diff --git a/nonprism/icedove-hardened-preferences/PKGBUILD b/nonprism/icedove-hardened-preferences/PKGBUILD
index a9f5c1887..93ec7f470 100644
--- a/nonprism/icedove-hardened-preferences/PKGBUILD
+++ b/nonprism/icedove-hardened-preferences/PKGBUILD
@@ -3,13 +3,14 @@
 
 pkgname=icedove-hardened-preferences
 pkgver=0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Sets hardened preferences in Icedove that protect from a variety of privacy, security, and fingerprinting attacks."
 arch=(any)
 license=(MPL)
 replaces=('icedove-hardened')
 conflicts=('icedove-hardened')
-depends=('icedove-enigmail' 'firejail')
+depends=(''firejail')
+optdepends=('icedove-enigmail: GPG support')
 url="https://wiki.parabola.nu/${pkgname%%-*}"
 install='icedove-hardened.install'
 source=('icedove-branding.js'
@@ -17,11 +18,11 @@ source=('icedove-branding.js'
 'thunderbird-branding.js'
 'icedove-hardened.install')
 sha512sums=('ad339dc16a7acab325f1a162cda017842c980fcb8ad1b725905947d0afc46959b59160147fd8fa86e2822dc51be4a4e6bf11d404ae19190b89a86459a290fd5e'
-'7d677a873d8c32e6d267d1e94e597b8086e3b27b3c3442aa2cf6e4de318139c62ad0386637fa7517c6e7b94c5d800fe2e94e7939f6a56f2ebb870827312dfff3'
+'e9d2fb3908de51be34374a05411968a776502439cf59cf163f29ea89b3c2077e1aa6f681af4a039da65eae3abf6e43982df8a60a3cc5a772e52f9366aa659973'
 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
 'db5a6449cd6eed04e742218e075b6680c7018df292885af36ba4fcb1129e7c84edae0b441a2a473e84584fb8080dd4f563774c5912cd9d340d44a3b9700894fb')
 whirlpoolsums=('673d8a38650a9f91de8531612d457ba056ce15bf88f147a3dacd6182bd0d4e2697f59f7e13d688b26c944c9799071dabb06a4b1ed9e4ccba264a3ee6c2ef4f6f'
-'886e6dec214ee9c838d3c85b065dc1a781538d19a4b6e02d2a7fd3f420b56d534fbd0d8e56b8df68d4c996f5767f19ed8fb29c92f0e4c4306f8adecb27eceb6d'
+'a14e47226af81ac15e0db8d3d0977de2dce046f13ba1b0eb4c1c01ba3b6bc4b4e6752f31d6cdc058ad16153b41fd53fade1acc354ed99ee5b0d1d1dd8a92a41f'
 '19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3'
 '78a3d592a03bb3589c6c1099053a3ca826b817c5b9715abb4f02cc2942a202e6e4ea12fb8276c76814f771d4d6e7625ee826f1286d1d41029c5a3d80926edd7c')
 
diff --git a/nonprism/icedove-hardened-preferences/icedove-hardened.sh b/nonprism/icedove-hardened-preferences/icedove-hardened.sh
index 27963b346..e63ddf35b 100755
--- a/nonprism/icedove-hardened-preferences/icedove-hardened.sh
+++ b/nonprism/icedove-hardened-preferences/icedove-hardened.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 
 ##############################################
-# IceDove-Hardened Jail and Cleaner Script #
+# Icedove-Hardened Jail and Cleaner Script #
 ##############################################
-echo "Closing any other instances of IceDove to avoid crashes..."
+echo "Closing any other instances of Icedove to avoid crashes..."
 pkill -x icedove
 wait
 echo "Copying Hardened Prefs..."
 cp /usr/lib/icedove/defaults/preferences/icedove-branding.js /usr/lib/icedove/defaults/preferences/thunderbird-branding.js
 wait
-echo "Waking the IceDove..."
+echo "Waking the Icedove..."
 
 # Trap cleaner function for IceDove exit cleaning
 function finish {
@@ -17,8 +17,8 @@ echo "Removing hardened preferences..."
 echo "" > /usr/lib/icedove/defaults/preferences/thunderbird-branding.js
     }
 
-## Firejail IceDove startup
+## Firejail Icedove startup
 /usr/bin/firejail --profile=/etc/firejail/icedove.profile --private-bin=bash,gpg2,pinentry,pinentry-gnome3,pinentry-curses,pinentry-tty,pinentry-gtk-2,pinentry-qt,pinentry-emacs,gpg-agent,icedove --private-tmp --private-etc=nsswitch.conf,resolv.conf --private-dev --nogroups /usr/bin/icedove
 
-## Exiting IceDove triggers the trap
+## Exiting Icedove triggers the trap
 trap finish EXIT
\ No newline at end of file