1
1
Fork 0
mirror of https://github.com/arkenfox/user.js.git synced 2024-06-06 21:36:11 +02:00

v3.2 - proper fix for the diff issue

- re-arrange the match patterns to fix the remaining issue of dropping lines after the 9999 block
- make it work on Mac too
- use `|` where possible so we don't need to escape the forward-slashes. That saves a few bytes and makes the pattern easier to read
This commit is contained in:
earthlng 2021-06-06 21:30:14 +00:00 committed by GitHub
parent ada31d4f50
commit 6968b9a369
Signed by: GitHub
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2,7 +2,7 @@
## arkenfox user.js updater for macOS and Linux
## version: 3.1
## version: 3.2
## 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 '/^\/\*.\+\*\/[[:space:]]*$/d' -e '/^\/\*/,/\*\//d' -e '/^[[:space:]]*$/d' -e 's/);[[:space:]]*\/\/.*/);/' "$1" > "$2"
sed -e '/^\/\*.*\*\/[[:space:]]*$/d' -e '/^\/\*/,/\*\//d' -e 's|^[[:space:]]*//.*$||' -e '/^[[:space:]]*$/d' -e 's|);[[:space:]]*//.*|);|' "$1" > "$2"
}
# Applies latest version of user.js and any custom overrides