2 Commits 023ba803e7 ... d64c446b9d

Auteur SHA1 Bericht Datum
  TotallyLeGIT d64c446b9d Bump version 2 jaren geleden
  TotallyLeGIT 82ab3966ee Fix parsing firefox/profiles.ini twice 2 jaren geleden
2 gewijzigde bestanden met toevoegingen van 13 en 5 verwijderingen
  1. 5 0
      CHANGELOG.md
  2. 8 5
      updater

+ 5 - 0
CHANGELOG.md

@@ -22,6 +22,11 @@ These are not completely removed yet, but will be in version 2.0.0.
 ### Security
 
 
+## [1.6.1] – 2022-11-18
+### Fixed
+* `firefox/profiles.ini` getting basically parsed twice if thunderbird was not installed.
+
+
 ## [1.6.0] – 2022-11-17
 ### Added
 * `-g` option: You can now specify a path to a user overrides file or directory which will be applied to every Firefox profile. If it's a directory every file in it that ends on `.js` will be applied. If you use the default path `~/.mozilla/firefox/global-user-overrides.js` you don't even need to use this option explicitly.

+ 8 - 5
updater

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ## Updater für die user.js von Privacy-Handbuch.de
-## Version: 1.6.0
+## Version: 1.6.1
 ## by: TotallyLeGIT
 
 ## based on the ghacks user.js updater by:
@@ -301,7 +301,7 @@ set_variables() {
 	readonly backup_dir='userjs_backups'
 	readonly diff_dir='userjs_diffs'
 	# TODO: remove version comment in line 4 in v2.0
-	readonly version='1.6.0'
+	readonly version='1.6.1'
 }
 
 usage() {
@@ -313,7 +313,7 @@ Firefox user.js:     ${color_usage}https://www.privacy-handbuch.de/handbuch_21u.
 Thunderbird user.js: ${color_usage}https://www.privacy-handbuch.de/handbuch_31p.htm
                      https://github.com/HorlogeSkynet/thunderbird-user.js${no_color_stdout}
 
-${color_usage}Usage: ${0} [-abdghilnrsuvy] [-c CONFIG] [-e VERSION] [-o OVERRIDE] [-p PROFILE]${no_color_stdout}
+${color_usage}Usage: ${0} [-abdghilnruvy] [-c CONFIG] [-e VERSION] [-o OVERRIDE] [-p PROFILE]${no_color_stdout}
 
   -a          Update all Firefox and Thunderbird profiles at once while keeping
               CONFIGs the same. Profiles without a user.js will be skipped.
@@ -411,8 +411,11 @@ get_profile_path() {
 		fi
 	elif [ "${profile_path_option}" = 'all' ]; then
 		for file in "${ff_file}" "${tb_file}"; do
-			[ -f "${file}" ] \
-				&& profile_path_temp="$(sed -ne 's/^Path=\(.*\)$/\1/p' "${file}")"
+			if [ -f "${file}" ]; then
+				profile_path_temp="$(sed -ne 's/^Path=\(.*\)$/\1/p' "${file}")"
+			else
+				continue
+			fi
 			while read -r line; do
 				if ! printf '%s' "${line}" | grep -q '^/'; then
 					profile_path_to_update="${file%profiles.ini}${line}"