95 final

- in v94 we switched to cookies lifetime as session, so users could use site exceptions to retain selected cookies (to stay logged in one assumes)
- that mean not deleting all cookies on shutdown
- but some login methods/types require more than cookies and also need the "site data" part of "cookies + site data" - that's the offlineApps part
- note: all site data (and cookies) is still cleared on close except site exceptions

README.md

@@ -15,13 +15,11 @@ Also be aware that the `arkenfox user.js` is made specifically for desktop Firef
 
 ### 🟧  sitemap
 
- - [Releases](https://github.com/arkenfox/user.js/releases)
+ - [releases](https://github.com/arkenfox/user.js/releases)
  - [changelogs](https://github.com/arkenfox/user.js/issues?utf8=%E2%9C%93&q=is%3Aissue+label%3Achangelog)
- - [Wiki](https://github.com/arkenfox/user.js/wiki)
+ - [wiki](https://github.com/arkenfox/user.js/wiki)
  - [stickies](https://github.com/arkenfox/user.js/issues?q=is%3Aissue+is%3Aopen+label%3A%22sticky+topic%22)
  - [diffs](https://github.com/arkenfox/user.js/issues?q=is%3Aissue+label%3Adiffs)
 
 ### 🟥  acknowledgments
 Literally thousands of sources, references and suggestions. Many thanks, and much appreciated.
-
-

prefsCleaner.sh

@@ -20,7 +20,7 @@ cd "$(dirname "${sfp}")"
 fQuit() {
 	## change directory back to the original working directory
 	cd "${currdir}"
-	[ $1 -eq 0 ] && echo -e "\n$2" || echo -e "\n$2" >&2
+	[ "$1" -eq 0 ] && echo -e "\n$2" || echo -e "\n$2" >&2
 	exit $1
 }
 
@@ -36,7 +36,7 @@ fFF_check() {
 	# this isn't elegant and might not be future-proof but should at least be compatible with any environment
 	while [ -e lock ]; do
 		echo -e "\nThis Firefox profile seems to be in use. Close Firefox and try again.\n" >&2
-		read -p "Press any key to continue."
+		read -r -p "Press any key to continue."
 	done
 }
 
@@ -48,7 +48,7 @@ fClean() {
 		if [[ "$line" =~ $prefexp && $prefs != *"@@${BASH_REMATCH[1]}@@"* ]]; then
 			prefs="${prefs}${BASH_REMATCH[1]}@@"
 		fi
-	done <<< "`grep -E \"$prefexp\" user.js`"
+	done <<< "$(grep -E "$prefexp" user.js)"
 
 	while IFS='' read -r line || [[ -n "$line" ]]; do
 		if [[ "$line" =~ ^$prefexp ]]; then

scratchpad-scripts/arkenfox-clear-RFP-alternatives.js

@@ -1,65 +0,0 @@
-/***
- Version: up to and including FF/ESR78
-
- This will reset the preferences that are under sections 4600 & 4700 in the
- arkenfox user.js. These are the prefs that are no longer necessary, or they
- conflict with, privacy.resistFingerprinting if you have that enabled.
-
- For instructions see:
- https://github.com/arkenfox/user.js/wiki/3.1-Resetting-Inactive-Prefs-[Scripts]
-***/
- 
-(function() {
-  let ops = [
-    /* section 4600 */
-    'dom.maxHardwareConcurrency',
-    'dom.enable_resource_timing',
-    'dom.enable_performance',
-    'device.sensors.enabled',
-    'browser.zoom.siteSpecific',
-    'dom.gamepad.enabled',
-    'dom.netinfo.enabled',
-    'media.webspeech.synth.enabled',
-    'media.video_stats.enabled',
-    'dom.w3c_touch_events.enabled',
-    'media.ondevicechange.enabled',
-    'webgl.enable-debug-renderer-info',
-    'dom.w3c_pointer_events.enabled',
-    'ui.use_standins_for_native_colors',
-    'ui.systemUsesDarkTheme',
-    'ui.prefersReducedMotion',
-    /* section 4700 */
-    'general.useragent.override',
-    'general.buildID.override',
-    'general.appname.override',
-    'general.appversion.override',
-    'general.platform.override',
-    'general.oscpu.override',
-    /* reset parrot: check your open about:config after running the script */
-    '_user.js.parrot'
-  ]
-
-  if("undefined" === typeof(Services)) {
-    alert("about:config needs to be the active tab!");
-    return;
-  }
-  
-  let c = 0;
-  for (let i = 0, len = ops.length; i < len; i++) {
-    if (Services.prefs.prefHasUserValue(ops[i])) {   
-      Services.prefs.clearUserPref(ops[i]);
-      if (!Services.prefs.prefHasUserValue(ops[i])) {
-        console.log("reset", ops[i]);
-        c++;
-      } else { console.log("failed to reset", ops[i]); }
-    }
-  }
-  
-  focus();
-  
-  let d = (c==1) ? " pref" : " prefs";
-  if (c > 0) {
-    alert("successfully reset " + c + d + "\n\nfor details check the Browser Console (Ctrl+Shift+J)");
-  } else { alert("nothing to reset"); }
-  
-})();

scratchpad-scripts/arkenfox-clear-deprecated.js

@@ -1,5 +1,5 @@
 /***
- Version: up to and including FF/ESR78
+  Version: up to and including FF/ESR91
 
   This will reset the preferences that have been deprecated by Mozilla
   and used in the arkenfox user.js
@@ -10,239 +10,223 @@
   https://github.com/arkenfox/user.js/wiki/3.1-Resetting-Inactive-Prefs-[Scripts]
 ***/
 
-(function() {
+(() => {
-  let ops = [
-    /* deprecated */
 
-    /* 78 */
+  if ('undefined' === typeof(Services)) return alert('about:config needs to be the active tab!');
-    'media.autoplay.enabled.user-gestures-needed',
+
-    'toolkit.cosmeticAnimations.enabled',
+  const aPREFS = [
-    /* 77 */
+    /* deprecated */
-    'browser.urlbar.oneOffSearches',
+    /* FF79-91 */
-    'browser.tabs.remote.allowLinkedWebInFileUriProcess',
+    'browser.cache.offline.storage.enable',
-    /* 76 */
+    'browser.download.hide_plugins_without_extensions',
-    'extensions.blocklist.url',
+    'browser.library.activity-stream.enabled',
-    /* 74 */
+    'browser.search.geoSpecificDefaults',
-    'geo.wifi.uri',
+    'browser.search.geoSpecificDefaults.url',
-    'geo.wifi.logging.enabled',
+    'dom.ipc.plugins.flash.subprocess.crashreporter.enabled',
-    'privacy.userContext.longPressBehavior',
+    'dom.ipc.plugins.reportCrashURL',
-    'webgl.disable-extensions',
+    'dom.w3c_pointer_events.enabled',
-    /* 72 */
+    'intl.charset.fallback.override',
+    'network.ftp.enabled',
+    'plugin.state.flash',
+    'security.mixed_content.block_object_subrequest',
+    'security.ssl.errorReporting.automatic',
+    'security.ssl.errorReporting.enabled',
+    'security.ssl.errorReporting.url',
+    /* 69-78 */
     'browser.newtabpage.activity-stream.telemetry.ping.endpoint',
-    'toolkit.telemetry.hybridContent.enabled',
+    'browser.tabs.remote.allowLinkedWebInFileUriProcess',
-    'dom.indexedDB.enabled',
+    'browser.urlbar.oneOffSearches',
-    /* 71 */
-    'devtools.webide.enabled',
     'devtools.webide.autoinstallADBExtension',
-    'offline-apps.allow_by_default',
+    'devtools.webide.enabled',
-    /* 69 */
+    'dom.indexedDB.enabled',
+    'extensions.blocklist.url',
+    'geo.wifi.logging.enabled',
+    'geo.wifi.uri',
     'gfx.downloadable_fonts.woff2.enabled',
-    'plugins.click_to_play',
     'media.autoplay.allow-muted',
-    /* 68 */
+    'media.autoplay.enabled.user-gestures-needed',
-    'browser.newtabpage.activity-stream.disableSnippets',
+    'offline-apps.allow_by_default',
+    'plugins.click_to_play',
+    'privacy.userContext.longPressBehavior',
+    'toolkit.cosmeticAnimations.enabled',
+    'toolkit.telemetry.hybridContent.enabled',
+    'webgl.disable-extensions',
+    /* 61-68 */
+    'app.update.enabled',
     'browser.aboutHomeSnippets.updateUrl',
-    'lightweightThemes.update.enabled',
-    'security.csp.experimentalEnabled',
-    /* F67 */
-    'dom.event.highrestimestamp.enabled',
-    'browser.newtabpage.activity-stream.asrouter.userprefs.cfr',
-    /* 66 */
     'browser.chrome.errorReporter.enabled',
     'browser.chrome.errorReporter.submitUrl',
-    'network.allow-experiments',
-    /* 65 */
-    'browser.urlbar.autocomplete.enabled',
-    'browser.fixup.hide_user_pass',
-    /* 64 */
-    'browser.onboarding.enabled',
-    'devtools.webide.autoinstallADBHelper',
-    'devtools.webide.adbAddonURL',
-    'security.csp.enable_violation_events',
-    /* 63 */
-    'browser.search.countryCode',
-    'app.update.enabled',
-    'shield.savant.enabled',
     'browser.chrome.favicons',
-    'media.autoplay.enabled',
-    'network.cookie.lifetime.days',
     'browser.ctrlTab.previews',
-    /* 62 */
+    'browser.fixup.hide_user_pass',
-    'plugin.state.java',
+    'browser.newtabpage.activity-stream.asrouter.userprefs.cfr',
-    /* 61 */
+    'browser.newtabpage.activity-stream.disableSnippets',
+    'browser.onboarding.enabled',
+    'browser.search.countryCode',
+    'browser.urlbar.autocomplete.enabled',
+    'devtools.webide.adbAddonURL',
+    'devtools.webide.autoinstallADBHelper',
+    'dom.event.highrestimestamp.enabled',
+    'experiments.activeExperiment',
     'experiments.enabled',
     'experiments.manifest.uri',
     'experiments.supported',
-    'experiments.activeExperiment',
+    'lightweightThemes.update.enabled',
+    'media.autoplay.enabled',
+    'network.allow-experiments',
+    'network.cookie.lifetime.days',
     'network.jar.block-remote-files',
     'network.jar.open-unsafe-types',
-    /* 60 */
+    'plugin.state.java',
+    'security.csp.enable_violation_events',
+    'security.csp.experimentalEnabled',
+    'shield.savant.enabled',
+    /* 60 or earlier */
+    'browser.bookmarks.showRecentlyBookmarked',
+    'browser.casting.enabled',
+    'browser.crashReports.unsubmittedCheck.autoSubmit',
+    'browser.formautofill.enabled',
+    'browser.formfill.saveHttpsForms',
+    'browser.fullscreen.animate',
+    'browser.history.allowPopState',
+    'browser.history.allowPushState',
+    'browser.history.allowReplaceState',
+    'browser.newtabpage.activity-stream.enabled',
+    'browser.newtabpage.directory.ping',
     'browser.newtabpage.directory.source',
     'browser.newtabpage.enhanced',
     'browser.newtabpage.introShown',
-    'extensions.shield-recipe-client.enabled',
+    'browser.pocket.api',
-    'extensions.shield-recipe-client.api_url',
+    'browser.pocket.enabled',
-    'browser.newtabpage.activity-stream.enabled',
+    'browser.pocket.oAuthConsumerKey',
-    'dom.workers.enabled',
+    'browser.pocket.site',
-    /* 59 */
+    'browser.polaris.enabled',
-    'intl.locale.matchOS',
+    'browser.safebrowsing.appRepURL',
-    'general.useragent.locale',
+    'browser.safebrowsing.enabled',
-    'datareporting.healthreport.about.reportUrl',
+    'browser.safebrowsing.gethashURL',
-    'dom.flyweb.enabled',
+    'browser.safebrowsing.malware.reportURL',
-    'security.mixed_content.use_hsts',
+    'browser.safebrowsing.provider.google.appRepURL',
-    'security.mixed_content.send_hsts_priming',
+    'browser.safebrowsing.reportErrorURL',
-    'network.http.referer.userControlPolicy',
+    'browser.safebrowsing.reportGenericURL',
-    'security.xpconnect.plugin.unrestricted',
+    'browser.safebrowsing.reportMalwareErrorURL',
-    'media.getusermedia.screensharing.allowed_domains',
+    'browser.safebrowsing.reportMalwareMistakeURL',
-    'camera.control.face_detection.enabled',
+    'browser.safebrowsing.reportMalwareURL',
-    'dom.disable_window_status_change',
+    'browser.safebrowsing.reportPhishMistakeURL',
-    'dom.idle-observers-api.enabled',
+    'browser.safebrowsing.reportURL',
-    /* 58 */
+    'browser.safebrowsing.updateURL',
-    'browser.crashReports.unsubmittedCheck.autoSubmit',
+    'browser.search.showOneOffButtons',
-    /* 57 */
-    'social.whitelist',
-    'social.toast-notifications.enabled',
-    'social.shareDirectory',
-    'social.remote-install.enabled',
-    'social.directories',
-    'social.share.activationPanelEnabled',
-    'social.enabled',
-    'media.eme.chromium-api.enabled',
-    'devtools.webide.autoinstallFxdtAdapters',
-    'browser.casting.enabled',
-    'browser.bookmarks.showRecentlyBookmarked',
-    /* 56 */
-    'extensions.screenshots.system-disabled',
-    'extensions.formautofill.experimental',
-    /* 55 */
-    'geo.security.allowinsecure',
     'browser.selfsupport.enabled',
     'browser.selfsupport.url',
-    'browser.newtabpage.directory.ping',
+    'browser.sessionstore.privacy_level_deferred',
-    'browser.formfill.saveHttpsForms',
-    'browser.formautofill.enabled',
-    'dom.enable_user_timing',
-    'dom.keyboardevent.code.enabled',
     'browser.tabs.animate',
-    'browser.fullscreen.animate',
+    'browser.trackingprotection.gethashURL',
-    /* 54 */
+    'browser.trackingprotection.updateURL',
-    'browser.safebrowsing.reportMalwareMistakeURL',
+    'browser.urlbar.unifiedcomplete',
-    'browser.safebrowsing.reportPhishMistakeURL',
-    'media.eme.apiVisible',
-    'dom.archivereader.enabled',
-    /* 53 */
-    'security.tls.unrestricted_rc4_fallback',
-    'plugin.scan.Acrobat',
-    'plugin.scan.Quicktime',
-    'plugin.scan.WindowsMediaPlayer',
-    'media.getusermedia.screensharing.allow_on_old_platforms',
-    'dom.beforeAfterKeyboardEvent.enabled',
-    /* 52 */
-    'network.http.sendSecureXSiteReferrer',
-    'media.gmp-eme-adobe.enabled',
-    'media.gmp-eme-adobe.visible',
-    'media.gmp-eme-adobe.autoupdate',
-    'dom.telephony.enabled',
-    'dom.battery.enabled',
-    /* 51 */
-    'media.block-play-until-visible',
-    'dom.vr.oculus050.enabled',
-    'network.http.spdy.enabled.v3-1',
-    /* 50 */
     'browser.usedOnWindows10.introURL',
-    'plugins.update.notifyUser',
+    'camera.control.autofocus_moving_callback.enabled',
-    'browser.safebrowsing.enabled',
+    'camera.control.face_detection.enabled',
-    'security.ssl3.ecdhe_ecdsa_rc4_128_sha',
+    'datareporting.healthreport.about.reportUrl',
-    'security.ssl3.ecdhe_rsa_rc4_128_sha',
+    'datareporting.healthreport.about.reportUrlUnified',
-    'security.ssl3.rsa_rc4_128_md5',
+    'datareporting.healthreport.documentServerURI',
-    'security.ssl3.rsa_rc4_128_sha',
+    'datareporting.healthreport.service.enabled',
-    'plugins.update.url',
+    'datareporting.policy.dataSubmissionEnabled.v2',
-    /* 49 */
+    'devtools.webide.autoinstallFxdtAdapters',
+    'dom.archivereader.enabled',
+    'dom.battery.enabled',
+    'dom.beforeAfterKeyboardEvent.enabled',
+    'dom.disable_image_src_set',
+    'dom.disable_window_open_feature.scrollbars',
+    'dom.disable_window_status_change',
+    'dom.enable_user_timing',
+    'dom.flyweb.enabled',
+    'dom.idle-observers-api.enabled',
+    'dom.keyboardevent.code.enabled',
+    'dom.network.enabled',
+    'dom.push.udp.wakeupEnabled',
+    'dom.telephony.enabled',
+    'dom.vr.oculus050.enabled',
+    'dom.workers.enabled',
+    'dom.workers.sharedWorkers.enabled',
+    'extensions.formautofill.experimental',
+    'extensions.screenshots.system-disabled',
+    'extensions.shield-recipe-client.api_url',
+    'extensions.shield-recipe-client.enabled',
+    'full-screen-api.approval-required',
+    'general.useragent.locale',
+    'geo.security.allowinsecure',
+    'intl.locale.matchOS',
     'loop.enabled',
-    'loop.server',
-    'loop.feedback.formURL',
-    'loop.feedback.manualFormURL',
     'loop.facebook.appId',
     'loop.facebook.enabled',
     'loop.facebook.fallbackUrl',
     'loop.facebook.shareUrl',
+    'loop.feedback.formURL',
+    'loop.feedback.manualFormURL',
     'loop.logDomains',
-    'dom.disable_window_open_feature.scrollbars',
+    'loop.server',
-    'dom.push.udp.wakeupEnabled',
+    'media.block-play-until-visible',
-    /* 48 */
+    'media.eme.apiVisible',
-    'browser.urlbar.unifiedcomplete',
+    'media.eme.chromium-api.enabled',
-    /* 47 */
+    'media.getusermedia.screensharing.allow_on_old_platforms',
-    'toolkit.telemetry.unifiedIsOptIn',
+    'media.getusermedia.screensharing.allowed_domains',
-    'datareporting.healthreport.about.reportUrlUnified',
+    'media.gmp-eme-adobe.autoupdate',
-    'browser.history.allowPopState',
+    'media.gmp-eme-adobe.enabled',
-    'browser.history.allowPushState',
+    'media.gmp-eme-adobe.visible',
-    'browser.history.allowReplaceState',
+    'network.http.referer.userControlPolicy',
-    /* 46 */
+    'network.http.sendSecureXSiteReferrer',
-    'datareporting.healthreport.service.enabled',
+    'network.http.spdy.enabled.http2draft',
-    'datareporting.healthreport.documentServerURI',
+    'network.http.spdy.enabled.v3-1',
-    'datareporting.policy.dataSubmissionEnabled.v2',
+    'network.websocket.enabled',
-    'browser.safebrowsing.appRepURL',
+    'pageThumbs.enabled',
-    'browser.polaris.enabled',
-    'browser.pocket.enabled',
-    'browser.pocket.api',
-    'browser.pocket.site',
-    'browser.pocket.oAuthConsumerKey',
-    /* 45 */
-    'browser.sessionstore.privacy_level_deferred',
-    /* 44 */
-    'browser.safebrowsing.provider.google.appRepURL',
-    'security.tls.insecure_fallback_hosts.use_static_list',
-    'dom.workers.sharedWorkers.enabled',
-    'dom.disable_image_src_set',
-    /* 43 */
-    'browser.safebrowsing.gethashURL',
-    'browser.safebrowsing.updateURL',
-    'browser.safebrowsing.malware.reportURL',
-    'browser.trackingprotection.gethashURL',
-    'browser.trackingprotection.updateURL',
     'pfs.datasource.url',
-    'browser.search.showOneOffButtons',
+    'plugin.scan.Acrobat',
-    /* 42 and earlier */
+    'plugin.scan.Quicktime',
-    'privacy.clearOnShutdown.passwords', // 42
+    'plugin.scan.WindowsMediaPlayer',
-    'full-screen-api.approval-required', // 42
+    'plugins.enumerable_names',
-    'browser.safebrowsing.reportErrorURL', // 41
+    'plugins.update.notifyUser',
-    'browser.safebrowsing.reportGenericURL', // 41
+    'plugins.update.url',
-    'browser.safebrowsing.reportMalwareErrorURL', // 41
+    'privacy.clearOnShutdown.passwords',
-    'browser.safebrowsing.reportMalwareURL', // 41
+    'privacy.donottrackheader.value',
-    'browser.safebrowsing.reportURL', // 41
+    'security.mixed_content.send_hsts_priming',
-    'plugins.enumerable_names', // 41
+    'security.mixed_content.use_hsts',
-    'network.http.spdy.enabled.http2draft', // 41
+    'security.ssl3.ecdhe_ecdsa_rc4_128_sha',
-    'camera.control.autofocus_moving_callback.enabled', // 37
+    'security.ssl3.ecdhe_rsa_rc4_128_sha',
-    'privacy.donottrackheader.value', // 36
+    'security.ssl3.rsa_rc4_128_md5',
-    'network.websocket.enabled', // 35
+    'security.ssl3.rsa_rc4_128_sha',
-    'dom.network.enabled', // 31
+    'security.tls.insecure_fallback_hosts.use_static_list',
-    'pageThumbs.enabled', // 25
+    'security.tls.unrestricted_rc4_fallback',
+    'security.xpconnect.plugin.unrestricted',
+    'social.directories',
+    'social.enabled',
+    'social.remote-install.enabled',
+    'social.share.activationPanelEnabled',
+    'social.shareDirectory',
+    'social.toast-notifications.enabled',
+    'social.whitelist',
+    'toolkit.telemetry.unifiedIsOptIn',
 
     /* reset parrot: check your open about:config after running the script */
     '_user.js.parrot'
-  ]
+  ];
 
-  if("undefined" === typeof(Services)) {
+  console.clear();
-    alert("about:config needs to be the active tab!");
-    return;
-  }
 
   let c = 0;
-  for (let i = 0, len = ops.length; i < len; i++) {
+  for (const sPname of aPREFS) {
-    if (Services.prefs.prefHasUserValue(ops[i])) {   
+    if (Services.prefs.prefHasUserValue(sPname)) {
-      Services.prefs.clearUserPref(ops[i]);
+      Services.prefs.clearUserPref(sPname);
-      if (!Services.prefs.prefHasUserValue(ops[i])) {
+      if (!Services.prefs.prefHasUserValue(sPname)) {
-        console.log("reset", ops[i]);
+        console.info('reset', sPname);
         c++;
-      } else { console.log("failed to reset", ops[i]); }
+      } else console.warn('failed to reset', sPname);
     }
   }
 
   focus();
 
-  let d = (c==1) ? " pref" : " prefs";
+  const d = (c==1) ? ' pref' : ' prefs';
-  if (c > 0) {
+  alert(c ? 'successfully reset ' + c + d + "\n\nfor details check the console" : 'nothing to reset');
-    alert("successfully reset " + c + d + "\n\nfor details check the Browser Console (Ctrl+Shift+J)");
+
-  } else { alert("nothing to reset"); }
+  return 'all done';
 
 })();

scratchpad-scripts/arkenfox-clear-removed.js

@@ -1,37 +1,222 @@
 /***
   This will reset the preferences that have been removed completely from the arkenfox user.js.
 
- Last updated: 25-May-2021
+  Last updated: 29-August-2021
 
   For instructions see:
   https://github.com/arkenfox/user.js/wiki/3.1-Resetting-Inactive-Prefs-[Scripts]
 ***/
 
-(function() {
+(() => {
-  let ops = [
+
+  if ('undefined' === typeof(Services)) return alert('about:config needs to be the active tab!');
+
+  const aPREFS = [
     /* removed in arkenfox user.js */
-    /* 52-alpha */
+    /* 79-91 */
+    'alerts.showFavicons',
+    'browser.newtabpage.activity-stream.asrouter.providers.snippets',
+    'browser.send_pings.require_same_host',
+    'browser.urlbar.usepreloadedtopurls.enabled',
+    'dom.allow_cut_copy',
+    'dom.battery.enabled',
+    'dom.IntersectionObserver.enabled',
+    'dom.storage.enabled',
+    'dom.vibrator.enabled',
+    'extensions.screenshots.upload-disabled',
+    'general.warnOnAboutConfig',
+    'gfx.direct2d.disabled',
+    'layers.acceleration.disabled',
+    'media.getusermedia.audiocapture.enabled',
+    'media.getusermedia.browser.enabled',
+    'media.getusermedia.screensharing.enabled',
+    'media.gmp-widevinecdm.visible',
+    'media.media-capabilities.enabled',
+    'network.http.redirection-limit',
+    'privacy.partition.network_state',
+    'security.insecure_connection_icon.enabled',
+    'security.mixed_content.block_active_content',
+    'security.ssl.enable_ocsp_stapling',
+    'security.ssl3.dhe_rsa_aes_128_sha',
+    'security.ssl3.dhe_rsa_aes_256_sha',
+    'webgl.min_capability_mode',
+    /* 69-78 */
+    'browser.cache.disk_cache_ssl',
+    'browser.search.geoip.url',
+    'browser.search.region',
+    'browser.sessionhistory.max_entries',
+    'dom.push.connection.enabled',
+    'dom.push.serverURL',
+    'extensions.getAddons.discovery.api_url',
+    'extensions.htmlaboutaddons.discover.enabled',
+    'extensions.webservice.discoverURL',
+    'intl.locale.requested',
+    'intl.regional_prefs.use_os_locales',
+    'media.block-autoplay-until-in-foreground',
+    'middlemouse.paste',
+    'plugin.sessionPermissionNow.intervalInMinutes',
+    'privacy.usercontext.about_newtab_segregation.enabled',
+    'security.insecure_connection_icon.pbmode.enabled',
+    'security.insecure_connection_text.pbmode.enabled',
+    'webgl.dxgl.enabled',
+    /* 61-68 */
+    'app.update.service.enabled',
+    'app.update.silent',
+    'app.update.staging.enabled',
+    'browser.cache.disk.capacity',
+    'browser.cache.disk.smart_size.enabled',
+    'browser.cache.disk.smart_size.first_run',
+    'browser.cache.offline.insecure.enable',
+    'browser.contentblocking.enabled',
+    'browser.eme.ui.enabled',
+    'browser.laterrun.enabled',
+    'browser.offline-apps.notify',
+    'browser.rights.3.shown',
+    'browser.safebrowsing.blockedURIs.enabled',
+    'browser.safebrowsing.downloads.remote.block_dangerous',
+    'browser.safebrowsing.downloads.remote.block_dangerous_host',
+    'browser.safebrowsing.provider.google.gethashURL',
+    'browser.safebrowsing.provider.google.reportMalwareMistakeURL',
+    'browser.safebrowsing.provider.google.reportPhishMistakeURL',
+    'browser.safebrowsing.provider.google.reportURL',
+    'browser.safebrowsing.provider.google.updateURL',
+    'browser.safebrowsing.provider.google4.dataSharing.enabled',
+    'browser.safebrowsing.provider.google4.dataSharingURL',
+    'browser.safebrowsing.provider.google4.gethashURL',
+    'browser.safebrowsing.provider.google4.reportMalwareMistakeURL',
+    'browser.safebrowsing.provider.google4.reportPhishMistakeURL',
+    'browser.safebrowsing.provider.google4.reportURL',
+    'browser.safebrowsing.provider.google4.updateURL',
+    'browser.safebrowsing.provider.mozilla.gethashURL',
+    'browser.safebrowsing.provider.mozilla.updateURL',
+    'browser.safebrowsing.reportPhishURL',
+    'browser.sessionhistory.max_total_viewers',
+    'browser.sessionstore.max_windows_undo',
+    'browser.slowStartup.maxSamples',
+    'browser.slowStartup.notificationDisabled',
+    'browser.slowStartup.samples',
+    'browser.storageManager.enabled',
+    'browser.urlbar.autoFill.typed',
+    'browser.urlbar.filter.javascript',
+    'browser.urlbar.maxHistoricalSearchSuggestions',
+    'browser.urlbar.userMadeSearchSuggestionsChoice',
+    'canvas.capturestream.enabled',
+    'dom.allow_scripts_to_close_windows',
+    'dom.disable_window_flip',
+    'dom.forms.datetime',
+    'dom.imagecapture.enabled',
+    'dom.popup_maximum',
+    'extensions.webextensions.keepStorageOnUninstall',
+    'extensions.webextensions.keepUuidOnUninstall',
+    'font.blacklist.underline_offset',
+    'font.name.monospace.x-unicode',
+    'font.name.monospace.x-western',
+    'font.name.sans-serif.x-unicode',
+    'font.name.sans-serif.x-western',
+    'font.name.serif.x-unicode',
+    'font.name.serif.x-western',
+    'gfx.offscreencanvas.enabled',
+    'javascript.options.shared_memory',
+    'layout.css.font-loading-api.enabled',
+    'media.gmp-gmpopenh264.autoupdate',
+    'media.gmp-gmpopenh264.enabled',
+    'media.gmp-manager.updateEnabled',
+    'media.gmp-manager.url',
+    'media.gmp-manager.url.override',
+    'media.gmp-widevinecdm.autoupdate',
+    'media.gmp.trial-create.enabled',
+    'media.navigator.video.enabled',
+    'media.peerconnection.ice.tcp',
+    'media.peerconnection.identity.enabled',
+    'media.peerconnection.identity.timeout',
+    'media.peerconnection.turn.disable',
+    'media.peerconnection.use_document_iceservers',
+    'media.peerconnection.video.enabled',
+    'network.auth.subresource-img-cross-origin-http-auth-allow',
+    'network.cookie.leave-secure-alone',
+    'network.cookie.same-site.enabled',
+    'network.dnsCacheEntries',
+    'network.dnsCacheExpiration',
+    'network.http.fast-fallback-to-IPv4',
+    'network.proxy.autoconfig_url.include_path',
+    'offline-apps.quota.warn',
+    'pdfjs.enableWebGL',
+    'plugin.default.state',
+    'plugin.defaultXpi.state',
+    'plugin.scan.plid.all',
+    'privacy.trackingprotection.annotate_channels',
+    'privacy.trackingprotection.lower_network_priority',
+    'privacy.trackingprotection.pbmode.enabled',
+    'privacy.trackingprotection.ui.enabled',
+    'security.data_uri.block_toplevel_data_uri_navigations',
+    'security.insecure_field_warning.contextual.enabled',
+    'security.insecure_password.ui.enabled',
+    'security.tls.version.fallback-limit',
+    'services.blocklist.addons.collection',
+    'services.blocklist.gfx.collection',
+    'services.blocklist.onecrl.collection',
+    'services.blocklist.plugins.collection',
+    'services.blocklist.signing.enforced',
+    'services.blocklist.update_enabled',
+    'signon.autofillForms.http',
+    'signon.storeWhenAutocompleteOff',
+    'toolkit.telemetry.cachedClientID',
+    'urlclassifier.trackingTable',
+    'xpinstall.whitelist.required',
+    /* 60 or lower */
+    'browser.migrate.automigrate.enabled',
+    'browser.search.geoip.timeout',
     'browser.search.reset.enabled',
     'browser.search.reset.whitelist',
-    /* 54-alpha */
+    'browser.stopReloadAnimation.enabled',
-    'browser.migrate.automigrate.enabled',
+    'browser.tabs.insertRelatedAfterCurrent',
+    'browser.tabs.loadDivertedInBackground',
+    'browser.tabs.loadInBackground',
+    'browser.tabs.selectOwnerOnClose',
+    'browser.urlbar.clickSelectsAll',
+    'browser.urlbar.doubleClickSelectsAll',
+    'device.storage.enabled',
+    'dom.keyboardevent.dispatch_during_composition',
+    'dom.presentation.controller.enabled',
+    'dom.presentation.discoverable',
+    'dom.presentation.discovery.enabled',
+    'dom.presentation.enabled',
+    'dom.presentation.receiver.enabled',
+    'dom.presentation.session_transport.data_channel.enable',
+    'dom.vr.oculus.enabled',
+    'dom.vr.openvr.enabled',
+    'dom.vr.osvr.enabled',
+    'extensions.pocket.api',
+    'extensions.pocket.oAuthConsumerKey',
+    'extensions.pocket.site',
+    'general.useragent.compatMode.firefox',
+    'geo.wifi.xhr.timeout',
+    'gfx.layerscope.enabled',
+    'media.flac.enabled',
+    'media.mediasource.enabled',
+    'media.mediasource.mp4.enabled',
+    'media.mediasource.webm.audio.enabled',
+    'media.mediasource.webm.enabled',
+    'media.mp4.enabled',
+    'media.ogg.enabled',
+    'media.ogg.flac.enabled',
+    'media.opus.enabled',
+    'media.raw.enabled',
+    'media.wave.enabled',
+    'media.webm.enabled',
+    'media.webspeech.recognition.enable',
+    'media.wmf.amd.vp9.enabled',
+    'media.wmf.enabled',
+    'media.wmf.vp9.enabled',
+    'network.dns.blockDotOnion',
+    'network.stricttransportsecurity.preloadlist',
+    'security.block_script_with_wrong_mime',
+    'security.fileuri.strict_origin_policy',
+    'security.sri.enable',
     'services.sync.enabled',
+    'ui.submenuDelay',
     'webextensions.storage.sync.enabled',
     'webextensions.storage.sync.serverURL',
-    /* 55-alpha */
-    'dom.keyboardevent.dispatch_during_composition', // default is false anyway
-    'dom.vr.oculus.enabled', // covered by dom.vr.enabled
-    'dom.vr.openvr.enabled', // ditto
-    'dom.vr.osvr.enabled', // ditto
-    'extensions.pocket.api', // covered by extensions.pocket.enabled
-    'extensions.pocket.oAuthConsumerKey', // ditto
-    'extensions.pocket.site', // ditto
-    /* 57-alpha */
-    'geo.wifi.xhr.timeout', // covered by geo.enabled
-    'browser.search.geoip.timeout', // ditto
-    'media.webspeech.recognition.enable', // default is false anyway
-    'gfx.layerscope.enabled', // default is false anyway
-    /* 58-alpha */
     //  excluding these e10 settings
        // 'browser.tabs.remote.autostart',
        // 'browser.tabs.remote.autostart.2',
@@ -47,222 +232,28 @@
        // 'dom.ipc.plugins.sandbox-level.default',
        // 'dom.ipc.plugins.sandbox-level.flash',
        // 'security.sandbox.logging.enabled',
-    'dom.presentation.controller.enabled',
-    'dom.presentation.discoverable',
-    'dom.presentation.discovery.enabled',
-    'dom.presentation.enabled',
-    'dom.presentation.receiver.enabled',
-    'dom.presentation.session_transport.data_channel.enable',
-    /* 59-alpha */
-    'browser.stopReloadAnimation.enabled',
-    'browser.tabs.insertRelatedAfterCurrent',
-    'browser.tabs.loadDivertedInBackground',
-    'browser.tabs.loadInBackground',
-    'browser.tabs.selectOwnerOnClose',
-    'browser.urlbar.clickSelectsAll',
-    'browser.urlbar.doubleClickSelectsAll',
-    'media.flac.enabled',
-    'media.mediasource.enabled',
-    'media.mediasource.mp4.enabled',
-    'media.mediasource.webm.audio.enabled',
-    'media.mediasource.webm.enabled',
-    'media.mp4.enabled',
-    'media.ogg.enabled',
-    'media.ogg.flac.enabled',
-    'media.opus.enabled',
-    'media.raw.enabled',
-    'media.wave.enabled',
-    'media.webm.enabled',
-    'media.wmf.amd.vp9.enabled',
-    'media.wmf.enabled',
-    'media.wmf.vp9.enabled',
-    'ui.submenuDelay',
-    /* 60-beta - these were all at default anyway */
-    'device.storage.enabled',
-    'general.useragent.compatMode.firefox',
-    'network.dns.blockDotOnion',
-    'network.stricttransportsecurity.preloadlist',
-    'security.block_script_with_wrong_mime',
-    'security.fileuri.strict_origin_policy',
-    'security.sri.enable',
-    /* 61-beta */
-    'browser.laterrun.enabled',
-    'browser.offline-apps.notify',
-    'browser.rights.3.shown',
-    'browser.slowStartup.maxSamples',
-    'browser.slowStartup.notificationDisabled',
-    'browser.slowStartup.samples',
-    'browser.storageManager.enabled',
-    'dom.allow_scripts_to_close_windows',
-    'dom.disable_window_flip',
-    'network.http.fast-fallback-to-IPv4',
-    'offline-apps.quota.warn',
-    'services.blocklist.signing.enforced',
-    /* 62-beta */
-    'browser.urlbar.autoFill.typed',
-    'security.tls.version.fallback-limit',
-    /* 63-beta */
-    'extensions.webextensions.keepStorageOnUninstall',
-    'extensions.webextensions.keepUuidOnUninstall',
-    'privacy.trackingprotection.ui.enabled',
-    /* 64-beta */
-    'browser.eme.ui.enabled',
-    'browser.sessionstore.max_windows_undo',
-    'network.auth.subresource-img-cross-origin-http-auth-allow',
-    'media.peerconnection.ice.tcp',
-    'media.peerconnection.identity.enabled',
-    'media.peerconnection.identity.timeout',
-    'media.peerconnection.turn.disable',
-    'media.peerconnection.use_document_iceservers',
-    'media.peerconnection.video.enabled',
-    'media.navigator.video.enabled',
-    /* 65-beta */
-    'browser.contentblocking.enabled',
-    'browser.urlbar.maxHistoricalSearchSuggestions',
-    /* 67-beta */
-    'app.update.service.enabled',
-    'app.update.silent',
-    'app.update.staging.enabled',
-    'browser.cache.disk.capacity',
-    'browser.cache.disk.smart_size.enabled',
-    'browser.cache.disk.smart_size.first_run',
-    'browser.cache.offline.insecure.enable',
-    'browser.safebrowsing.provider.google.reportMalwareMistakeURL',
-    'browser.safebrowsing.provider.google.reportPhishMistakeURL',
-    'browser.safebrowsing.provider.google.reportURL',
-    'browser.safebrowsing.provider.google4.dataSharing.enabled',
-    'browser.safebrowsing.provider.google4.dataSharingURL',
-    'browser.safebrowsing.provider.google4.reportMalwareMistakeURL',
-    'browser.safebrowsing.provider.google4.reportPhishMistakeURL',
-    'browser.safebrowsing.provider.google4.reportURL',
-    'browser.safebrowsing.reportPhishURL',
-    'browser.sessionhistory.max_total_viewers',
-    'browser.urlbar.filter.javascript',
-    'canvas.capturestream.enabled',
-    'dom.imagecapture.enabled',
-    'dom.popup_maximum',
-    'gfx.offscreencanvas.enabled',
-    'javascript.options.shared_memory',
-    'media.gmp-gmpopenh264.autoupdate',
-    'media.gmp-gmpopenh264.enabled',
-    'media.gmp-manager.updateEnabled',
-    'media.gmp-manager.url',
-    'media.gmp-manager.url.override',
-    'media.gmp.trial-create.enabled',
-    'media.gmp-widevinecdm.autoupdate',
-    'network.cookie.leave-secure-alone',
-    'network.cookie.same-site.enabled',
-    'network.dnsCacheEntries',
-    'network.dnsCacheExpiration',
-    'network.proxy.autoconfig_url.include_path',
-    'pdfjs.enableWebGL',
-    'plugin.default.state',
-    'plugin.defaultXpi.state',
-    'plugin.scan.plid.all',
-    'security.data_uri.block_toplevel_data_uri_navigations',
-    'security.insecure_field_warning.contextual.enabled',
-    'security.insecure_password.ui.enabled',
-    'signon.autofillForms.http',
-    'signon.storeWhenAutocompleteOff',
-    'xpinstall.whitelist.required',
-    /* 67-beta: Blocklist, SB & TP cleanup: these were all inactive */
-    'browser.safebrowsing.downloads.remote.block_dangerous',
-    'browser.safebrowsing.downloads.remote.block_dangerous_host',
-    'browser.safebrowsing.blockedURIs.enabled',
-    'browser.safebrowsing.provider.google.gethashURL',
-    'browser.safebrowsing.provider.google.updateURL',
-    'browser.safebrowsing.provider.google4.gethashURL',
-    'browser.safebrowsing.provider.google4.updateURL',
-    'browser.safebrowsing.provider.mozilla.gethashURL',
-    'browser.safebrowsing.provider.mozilla.updateURL',
-    'browser.urlbar.userMadeSearchSuggestionsChoice',
-    'privacy.trackingprotection.annotate_channels',
-    'privacy.trackingprotection.lower_network_priority',
-    'privacy.trackingprotection.pbmode.enabled',
-    'services.blocklist.addons.collection',
-    'services.blocklist.gfx.collection',
-    'services.blocklist.onecrl.collection',
-    'services.blocklist.plugins.collection',
-    'services.blocklist.update_enabled',
-    'urlclassifier.trackingTable',
-    /* 68-beta */
-    'dom.forms.datetime',
-    'font.blacklist.underline_offset',
-    'font.name.monospace.x-unicode',
-    'font.name.monospace.x-western',
-    'font.name.sans-serif.x-unicode',
-    'font.name.sans-serif.x-western',
-    'font.name.serif.x-unicode',
-    'font.name.serif.x-western',
-    'layout.css.font-loading-api.enabled',
-    'toolkit.telemetry.cachedClientID',
-    /* 69-beta */
-    'plugin.sessionPermissionNow.intervalInMinutes',
-    /* 70-beta */
-    'browser.cache.disk_cache_ssl',
-    'browser.sessionhistory.max_entries',
-    'dom.push.connection.enabled',
-    'dom.push.serverURL',
-    'extensions.getAddons.discovery.api_url',
-    'extensions.htmlaboutaddons.discover.enabled',
-    'extensions.webservice.discoverURL',
-    'intl.locale.requested',
-    'intl.regional_prefs.use_os_locales',
-    'privacy.usercontext.about_newtab_segregation.enabled',
-    'security.insecure_connection_icon.pbmode.enabled',
-    'security.insecure_connection_text.pbmode.enabled',
-    'webgl.dxgl.enabled',
-    /* 71-beta */
-    'media.block-autoplay-until-in-foreground',
-    'middlemouse.paste',
-    /* 75-beta */
-    'browser.search.geoip.url',
-    'browser.search.region',
-    /* 79-beta */
-    'browser.urlbar.usepreloadedtopurls.enabled',
-    /* 82-beta */
-    'dom.IntersectionObserver.enabled',
-    'extensions.screenshots.upload-disabled',
-    'privacy.partition.network_state',
-    'security.ssl3.dhe_rsa_aes_128_sha',
-    'security.ssl3.dhe_rsa_aes_256_sha',
-    /* 84-beta */
-    'browser.newtabpage.activity-stream.asrouter.providers.snippets',
-    /* 85-beta */
-    'network.http.redirection-limit',
-    /* 86-beta */
-    'media.gmp-widevinecdm.visible',
-    /* 87-beta */
-    'browser.send_pings.require_same_host',
-    /* 88-beta */
-    'webgl.min_capability_mode',
-    /* 89-beta */
-    'security.ssl.enable_ocsp_stapling',
     /* reset parrot: check your open about:config after running the script */
     '_user.js.parrot'
-  ]
+  ];
 
-  if("undefined" === typeof(Services)) {
+  console.clear();
-    alert("about:config needs to be the active tab!");
-    return;
-  }
 
   let c = 0;
-  for (let i = 0, len = ops.length; i < len; i++) {
+  for (const sPname of aPREFS) {
-    if (Services.prefs.prefHasUserValue(ops[i])) {   
+    if (Services.prefs.prefHasUserValue(sPname)) {
-      Services.prefs.clearUserPref(ops[i]);
+      Services.prefs.clearUserPref(sPname);
-      if (!Services.prefs.prefHasUserValue(ops[i])) {
+      if (!Services.prefs.prefHasUserValue(sPname)) {
-        console.log("reset", ops[i]);
+        console.info('reset', sPname);
         c++;
-      } else { console.log("failed to reset", ops[i]); }
+      } else console.warn('failed to reset', sPname);
     }
   }
 
   focus();
 
-  let d = (c==1) ? " pref" : " prefs";
+  const d = (c==1) ? ' pref' : ' prefs';
-  if (c > 0) {
+  alert(c ? 'successfully reset ' + c + d + "\n\nfor details check the console" : 'nothing to reset');
-    alert("successfully reset " + c + d + "\n\nfor details check the Browser Console (Ctrl+Shift+J)");
+
-  } else { alert("nothing to reset"); }
+  return 'all done';
 
 })();

scratchpad-scripts/troubleshooter.js

@@ -1,4 +1,3 @@
-
 /*** arkenfox user.js troubleshooter.js v1.6.3 ***/
 
 (function() {

updater.sh

@@ -41,9 +41,9 @@ ESR=false
 
 # Download method priority: curl -> wget
 DOWNLOAD_METHOD=''
-if [[ $(command -v 'curl') ]]; then
+if command -v curl >/dev/null; then
   DOWNLOAD_METHOD='curl --max-redirs 3 -so'
-elif [[ $(command -v 'wget') ]]; then
+elif command -v wget >/dev/null; then
   DOWNLOAD_METHOD='wget --max-redirect 3 --quiet -O'
 else
   echo -e "${RED}This script requires curl or wget.\nProcess aborted${NC}"
@@ -123,7 +123,7 @@ readIniFile () { # expects one argument: absolute path of profiles.ini
   declare -r inifile="$1"
 
   # tempIni will contain: [ProfileX], Name=, IsRelative= and Path= (and Default= if present) of the only (if) or the selected (else) profile
-  if [ $(grep -c '^\[Profile' "${inifile}") -eq "1" ]; then ### only 1 profile found
+  if [ "$(grep -c '^\[Profile' "${inifile}")" -eq "1" ]; then ### only 1 profile found
     tempIni="$(grep '^\[Profile' -A 4 "${inifile}")"
   else
     echo -e "Profiles found:\n––––––––––––––––––––––––––––––"
@@ -176,7 +176,7 @@ getProfilePath () {
 
 # Returns the version number of a updater.sh file
 get_updater_version() {
-  echo $(sed -n '5 s/.*[[:blank:]]\([[:digit:]]*\.[[:digit:]]*\)/\1/p' "$1")
+  echo "$(sed -n '5 s/.*[[:blank:]]\([[:digit:]]*\.[[:digit:]]*\)/\1/p' "$1")"
 }
 
 # Update updater.sh
@@ -185,13 +185,13 @@ get_updater_version () {
 #   -d: New version will not be looked for and update will not occur
 #   -u: Check for update, if available, execute without asking
 update_updater() {
-  [ $UPDATE = 'no' ] && return 0 # User signified not to check for updates
+  [ "$UPDATE" = 'no' ] && return 0 # User signified not to check for updates
 
   declare -r tmpfile="$(download_file 'https://raw.githubusercontent.com/arkenfox/user.js/master/updater.sh')"
   [ -z "${tmpfile}" ] && echo -e "${RED}Error! Could not download updater.sh${NC}" && return 1 # check if download failed
 
   if [[ $(get_updater_version "$SCRIPT_FILE") < $(get_updater_version "${tmpfile}") ]]; then
-    if [ $UPDATE = 'check' ]; then
+    if [ "$UPDATE" = 'check' ]; then
       echo -e "There is a newer version of updater.sh available. ${RED}Update and execute Y/N?${NC}"
       read -p "" -n 1 -r
       echo -e "\n\n"
@@ -212,7 +212,7 @@ update_updater () {
 
 # Returns version number of a user.js file
 get_userjs_version() {
-  [ -e $1 ] && echo "$(sed -n '4p' "$1")" || echo "Not detected."
+  [ -e "$1" ] && echo "$(sed -n '4p' "$1")" || echo "Not detected."
 }
 
 add_override() {
@@ -246,16 +246,16 @@ update_userjs () {
 
   echo -e "Please observe the following information:
     Firefox profile:  ${ORANGE}$(pwd)${NC}
-    Available online: ${ORANGE}$(get_userjs_version $newfile)${NC}
+    Available online: ${ORANGE}$(get_userjs_version "$newfile")${NC}
     Currently using:  ${ORANGE}$(get_userjs_version user.js)${NC}\n\n"
 
-  if [ $CONFIRM = 'yes' ]; then
+  if [ "$CONFIRM" = 'yes' ]; then
     echo -e "This script will update to the latest user.js file and append any custom configurations from user-overrides.js. ${RED}Continue Y/N? ${NC}"
     read -p "" -n 1 -r
     echo -e "\n"
     if [[ $REPLY =~ ^[Nn]$ ]]; then
       echo -e "${RED}Process aborted${NC}"
-      rm $newfile
+      rm "$newfile"
       return 1
     fi
   fi
@@ -269,7 +269,7 @@ update_userjs () {
   # backup user.js
   mkdir -p userjs_backups
   local bakname="userjs_backups/user.js.backup.$(date +"%Y-%m-%d_%H%M")"
-  [ $BACKUP = 'single' ] && bakname='userjs_backups/user.js.backup'
+  [ "$BACKUP" = 'single' ] && bakname='userjs_backups/user.js.backup'
   cp user.js "$bakname" &>/dev/null
 
   mv "${newfile}" user.js
@@ -295,19 +295,19 @@ update_userjs () {
     past_nocomments='userjs_diffs/past_userjs.txt'
     current_nocomments='userjs_diffs/current_userjs.txt'
 
-    remove_comments $pastuserjs $past_nocomments
+    remove_comments "$pastuserjs" "$past_nocomments"
-    remove_comments user.js $current_nocomments
+    remove_comments user.js "$current_nocomments"
 
     diffname="userjs_diffs/diff_$(date +"%Y-%m-%d_%H%M").txt"
-    diff=$(diff -w -B -U 0 $past_nocomments $current_nocomments)
+    diff=$(diff -w -B -U 0 "$past_nocomments" "$current_nocomments")
-    if [ ! -z "$diff" ]; then
+    if [ -n "$diff" ]; then
       echo "$diff" > "$diffname"
       echo -e "Status: ${GREEN}A diff file was created:${NC} ${PWD}/${diffname}"
     else
       echo -e "Warning: ${ORANGE}Your new user.js file appears to be identical.  No diff file was created.${NC}"
-      [ $BACKUP = 'multiple' ] && rm $bakname &>/dev/null
+      [ "$BACKUP" = 'multiple' ] && rm "$bakname" &>/dev/null
     fi
-    rm $past_nocomments $current_nocomments $pastuserjs &>/dev/null
+    rm "$past_nocomments" "$current_nocomments" "$pastuserjs" &>/dev/null
   fi
 
   [ "$VIEW" = true ] && open_file "${PWD}/user.js"
@@ -319,7 +319,7 @@ update_userjs () {
 
 if [ $# != 0 ]; then
   # Display usage if first argument is -help or --help
-  if [ $1 = '--help' ] || [ $1 = '-help' ]; then
+  if [ "$1" = '--help' ] || [ "$1" = '-help' ]; then
     usage
   else
     while getopts ":hp:ludsno:bcvre" opt; do
@@ -363,7 +363,7 @@ if [ $# != 0 ]; then
         r)
           tfile="$(download_file 'https://raw.githubusercontent.com/arkenfox/user.js/master/user.js')"
           [ -z "${tfile}" ] && echo -e "${RED}Error! Could not download user.js${NC}" && exit 1 # check if download failed
-          mv $tfile "${tfile}.js"
+          mv "$tfile" "${tfile}.js"
           echo -e "${ORANGE}Warning: user.js was saved to temporary file ${tfile}.js${NC}"
           open_file "${tfile}.js"
           exit 0
@@ -382,7 +382,7 @@ if [ $# != 0 ]; then
 fi
 
 show_banner
-update_updater $@
+update_updater "$@"
 
 getProfilePath # updates PROFILE_PATH or exits on error
 cd "$PROFILE_PATH" && update_userjs