1
1
Fork 0
mirror of https://github.com/arkenfox/user.js.git synced 2024-05-23 16:56:13 +02:00

v3.1 - (mostly) fix diff functionality

see #1188 

this should fix the issue that "All prefs after a multi-line comment declaration, on a single line, are deleted with the remove_comments function from the updater."
This commit is contained in:
earthlng 2021-06-06 18:01:56 +00:00 committed by GitHub
parent d973e11714
commit ada31d4f50
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,7 +2,7 @@
## arkenfox user.js updater for macOS and Linux
## version: 3.0
## version: 3.1
## Author: Pat Johnson (@overdodactyl)
## Additional contributors: @earthlng, @ema-pe, @claustromaniac
@ -236,7 +236,7 @@ add_override () {
}
remove_comments () { # expects 2 arguments: from-file and to-file
sed -e 's/^[[:space:]]*\/\/.*$//' -e '/^\/\*/,/\*\//d' -e '/^[[:space:]]*$/d' -e 's/);[[:space:]]*\/\/.*/);/' "$1" > "$2"
sed -e 's/^[[:space:]]*\/\/.*$//' -e '/^\/\*.\+\*\/[[:space:]]*$/d' -e '/^\/\*/,/\*\//d' -e '/^[[:space:]]*$/d' -e 's/);[[:space:]]*\/\/.*/);/' "$1" > "$2"
}
# Applies latest version of user.js and any custom overrides