Commit graph

16 commits

Author SHA1 Message Date
claustromaniac
103711020b Merge 2017-11-27 15:37:28 +00:00
claustromaniac
b8d450dd21 10 (the desktop app is so comfortable that I can commit while I do other stuff) 2017-11-27 06:00:40 +00:00
claustromaniac
79fc85f763 Prevent merging from messing with _user.js.parrot 2017-11-27 05:40:15 +00:00
claustromaniac
0beb517138 8 2017-11-27 05:13:18 +00:00
claustromaniac
48fb72d3eb 7 (I'm done with summaries.)
I'm done with descriptions too.
2017-11-27 04:46:32 +00:00
claustromaniac
9905f50ae3 Streamlining phase 3
I still have to look into the missing exclamation marks and such.
2017-11-27 02:41:12 +00:00
claustromaniac
bb5a75ab06 Can't stop the commit avalanche. You just can't! 2017-11-26 20:49:43 +00:00
claustromaniac
a2d5779f48 Some details I forgot 2017-11-26 20:32:25 +00:00
claustromaniac
de5a312f82 Streamlining v2
Sorry I messed up again lawl
2017-11-26 20:19:50 +00:00
claustromaniac
a955aa5418 Mostly streamlining
Fixed botched -logp switch too.
2017-11-26 20:18:03 +00:00
claustromaniac
3cb8da0956 Updater for Windows v3.0 (the real deal)
- Added -UpdateBatch switch so the updater can auto update itself on execution.
- Added new -LogP switch, that works just like -Log, but also opens the log file after updating.
- Added new -MultiOverrides switch, that uses any and all .js files in a 'user.js-overrides' sub-folder as overrides instead of the default 'user-overrides.js' file. Files are appended in alphabetical order.
- Added new -Merge switch, that uses a new algorithm to merge overrides instead of appending them. Files are parsed in alphabetical order and when there are conflicting records, the values of the last ones declared are the ones used. The order of said records doesn't change in the resulting file. Comments are appended normally. When the script is run with both -Merge and -MultiOverrides switches, an 'user-overrides-merged.js' file is also generated in the root directory for quick reference. Said file contains only the merged data from override files and can be safely discarded after updating.

For a more full list of changes, with jokes and nasty surprises, see my epic fail (#286).
2017-11-26 18:17:43 +00:00
earthlng
a269e53f88
Update updater.bat
- multioverrides support
- formatting changes
2017-11-26 15:57:32 +01:00
claustromaniac
efcaa3de8a
Just some polishing 2017-11-19 17:41:19 +00:00
earthlng
cdeb0abe79
update to v2.0
https://github.com/ghacksuserjs/ghacks-user.js/issues/264#issuecomment-345462158

- It can now handle read-only files.
- it is somewhat more explicit regarding what it's doing in some circumstances. For example, it now informs the user when no changes are made.
- It now accepts two parameters: `-unattended` and `-log`
- Minor improvements here and there.
2017-11-19 08:58:47 +01:00
earthlng
754ec610d1
typo 2017-11-17 15:48:39 +01:00
earthlng
fe752c8be3
Create updater.bat
thanks @claustromaniac
2017-11-17 15:45:16 +01:00