v3.2 - proper fix for the diff issue

earthlng · web-flow · commit 6968b9a369c3 · 2021-06-06T21:30:14.000Z
- 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
diff --git a/updater.sh b/updater.sh
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`## arkenfox user.js updater for macOS and Linux`
`4`	`4`
`5`		`-## version: 3.1`
	`5`	`+## version: 3.2`
`6`	`6`	`## Author: Pat Johnson (@overdodactyl)`
`7`	`7`	`## Additional contributors: @earthlng, @ema-pe, @claustromaniac`
`8`	`8`
`@@ -236,7 +236,7 @@ add_override () {`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`remove_comments () { # expects 2 arguments: from-file and to-file`
`239`		`- sed -e 's/^[[:space:]]\/\/.$//' -e '/^\/\.\+\\/[[:space:]]$/d' -e '/^\/\/,/\\//d' -e '/^[[:space:]]$/d' -e 's/);[[:space:]]\/\/./);/' "$1" > "$2"`
	`239`	`+ sed -e '/^\/\.\\/[[:space:]]$/d' -e '/^\/\/,/\\//d' -e 's\|^[[:space:]]//.$\|\|' -e '/^[[:space:]]$/d' -e 's\|);[[:space:]]//.*\|);\|' "$1" > "$2"`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`# Applies latest version of user.js and any custom overrides`