Updated 3.3 Updater Scripts (markdown)

Thorin-Oakenpants
2017-12-25 20:30:38 +13:00
parent c7c207a8be
commit 28890451d8

@@ -26,10 +26,7 @@ writes the console output to the logfile `user.js-update-log.txt`
works just like `-Log` but also opens the logfile after updating
- `-Merge`
merges overrides instead of appending them. Comments are appended normally. `_user.js.parrot` lines are not merged. Overrides for inactive (commented out) user.js prefs will be appended.
When `-Merge` and `-MultiOverrides` are used together, a `user-overrides-merged.js` file is also generated in the root directory for quick reference. It contains only the merged data from override files and can be safely discarded after updating, or used as the new user-overrides.js.
When there are conflicting records for the same pref, the value of the last one declared will be used.
~~Lastly, `-merge` doesn't like exclamation marks (`!`) in pref-values or comments behind user_pref overrides! If a pref-value needs them or you can't live without a ton of `!!!`s in your user_pref override comments, you can prepend a TAB or a JS multi-line-comment which will then append that line instead of trying to merge it.~~ (EDIT: fixed in v4.0)
merges overrides instead of appending them. Comments are appended normally. `_user.js.parrot` lines are not merged. Overrides for inactive (commented out) user.js prefs will be appended. When `-Merge` and `-MultiOverrides` are used together, a `user-overrides-merged.js` file is also generated in the root directory for quick reference. It contains only the merged data from override files and can be safely discarded after updating, or used as the new user-overrides.js. When there are conflicting records for the same pref, the value of the last one declared will be used.
The following example illustrates how `-merge` works:
ghacks user.js file contains this: