make noscript optional and fix naming

2 files changed, 10 insertions, 9 deletions

diff --git a/nonprism/iceweasel-hardened-preferences/PKGBUILD b/nonprism/iceweasel-hardened-preferences/PKGBUILD
index 74ea7f039..04a82373f 100644
--- a/nonprism/iceweasel-hardened-preferences/PKGBUILD
+++ b/nonprism/iceweasel-hardened-preferences/PKGBUILD
@@ -9,7 +9,8 @@ arch=(any)
 license=(MPL)
 replaces=('iceweasel-hardened')
 conflicts=('iceweasel-hardened')
-depends=('firejail' 'iceweasel-noscript')
+depends=('firejail')
+optdepends=('iceweasel-noscript' : XSS and Javascript Protection [Important!]')
 url="https://wiki.parabola.nu/${pkgname%%-*}"
 install=iceweasel-hardened.install
 source=('firefox-branding.js'
@@ -17,11 +18,11 @@ source=('firefox-branding.js'
 'iceweasel-branding.js'
 'iceweasel-hardened.install')
 sha512sums=('cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e'
-'d8e890930197cae0eeef9489055a922753fdf0b0f267753cb161920d987e9f7c72ea46cc875249972e65b229aee84c4e407eb6c7b57165257d6590b0e09bbe5e'
+'d542452fa1d619d22e9c9b6e4af58d7310abdc5c81d871a1abbddb0087c53913c8a244af2b7be416a2c439383afc2480c439078ebde0ccac518300d9027b4800'
 'c05992d3db2466928cf001b344fe01e08afc667296f65284f84fc5ba24c7d4fe71c2cb5e7b69776d31db3726f05b1176a3bd20ee077d6a0b43e6c5a007bc7563'
 '26e48145cfeaf8f243c6f4f30ccc806aea3fb825370e43b34dab33e1404a88849c888bf25a0b2038b3535b2d45569af24652894bb7a845b9bbc90fa23787cd2e')
 whirlpoolsums=('19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3'
-'468d57cb9d178233a22f969637a68d68fa9df04e477a5b282f6c29eb74350c98508db103ad808c1ce89805a6b466758da711ebb59bf4eb291158009f731734a9'
+'f7cb38e58f644ddeae9f931c290ae1d96e54d0a8937171f2ebad498b65b87f2115cbd0a0f2a55e12dceba7a387e70fd2432678010a87975f8322c9c27b41efd2'
 '75096151a65da722382b51ee0655e76cdba717e4bc3ffe9fda731435ac061447e7e019d8e8b50c659b1ab66dd64eabe99798c81fac21cad31cc843b62a05e51d'
 '1b1e6202ce3fbf05e0513af03e94f2ad5a70b774404dd72260363fdc1f810047cbfb9889ad6f800f5bbe87b050c2556ea30567baf7b07e67f1afc05fc665fb5e')
 
diff --git a/nonprism/iceweasel-hardened-preferences/iceweasel-hardened.sh b/nonprism/iceweasel-hardened-preferences/iceweasel-hardened.sh
index 9a0842f34..b01df4122 100755
--- a/nonprism/iceweasel-hardened-preferences/iceweasel-hardened.sh
+++ b/nonprism/iceweasel-hardened-preferences/iceweasel-hardened.sh
@@ -1,24 +1,24 @@
 #!/bin/sh
 
 ##############################################
-# IceWeasel-Hardened Jail and Cleaner Script #
+# Iceweasel-Hardened Jail and Cleaner Script #
 ##############################################
-echo "Closing any other instances of IceWeasel to avoid crashes..."
+echo "Closing any other instances of Iceweasel to avoid crashes..."
 pkill -x iceweasel
 wait
 echo "Copying Hardened Prefs..."
 cp /usr/lib/iceweasel/browser/defaults/preferences/iceweasel-branding.js /usr/lib/iceweasel/browser/defaults/preferences/firefox-branding.js
 wait
-echo "Waking the IceWeasel..."
+echo "Waking the Iceweasel..."
 
-# Trap cleaner function for IceWeasel exit cleaning
+# Trap cleaner function for Iceweasel exit cleaning
 function finish {
 echo "Removing hardened preferences..."
 echo "" > /usr/lib/iceweasel/browser/defaults/preferences/firefox-branding.js
     }
 
-## Firejail IceWeasel startup
+## Firejail Iceweasel startup
 /usr/bin/firejail --profile=/etc/firejail/firefox.profile --noroot --nogroups --caps.drop=all --private-etc=nsswitch.conf,resolv.conf  --private-bin=bash,iceweasel --private-tmp --private-dev /usr/bin/iceweasel --private-window
 
-## Exiting IceWeasel triggers the trap
+## Exiting Iceweasel triggers the trap
 trap finish EXIT
\ No newline at end of file