user.js

commit ada31d4f504d666530c038d9cf75fcfbb940ba67
parent d973e1171415282d1a2b7a88dbafd1e6d3a0e549
Author: earthlng <earthlng@users.noreply.github.com>
Date:   Sun,  6 Jun 2021 18:01:56 +0000

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."
Diffstat:
M
updater.sh
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/updater.sh b/updater.sh
@@ -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