1
0

updater.sh: add -e option for ESR users (#565)

This commit is contained in:
Pat Johnson 2018-12-01 07:47:58 -07:00 committed by earthlng
parent 74e753d0c5
commit 51237f6889

View File

@ -2,7 +2,7 @@
## ghacks-user.js updater for macOS and Linux ## ghacks-user.js updater for macOS and Linux
## version: 2.3 ## version: 2.4
## Author: Pat Johnson (@overdodactyl) ## Author: Pat Johnson (@overdodactyl)
## Additional contributors: @earthlng, @ema-pe, @claustromaniac ## Additional contributors: @earthlng, @ema-pe, @claustromaniac
@ -37,6 +37,7 @@ COMPARE=false
SKIPOVERRIDE=false SKIPOVERRIDE=false
VIEW=false VIEW=false
PROFILE_PATH=false PROFILE_PATH=false
ESR=false
# Download method priority: curl -> wget # Download method priority: curl -> wget
DOWNLOAD_METHOD='' DOWNLOAD_METHOD=''
@ -69,7 +70,7 @@ show_banner () {
######################### #########################
usage() { usage() {
echo -e "${BLUE}\nUsage: $0 [-h] [-p PROFILE] [-u] [-d] [-s] [-n] [-b] [-c] [-v] [-r] [-o OVERRIDE]\n${NC}" 1>&2 # Echo usage string to standard error echo -e "${BLUE}\nUsage: $0 [-h] [-p PROFILE] [-u] [-d] [-s] [-n] [-b] [-c] [-v] [-r] [-e] [-o OVERRIDE]\n${NC}" 1>&2 # Echo usage string to standard error
echo 'Optional Arguments:' echo 'Optional Arguments:'
echo -e "\t-h,\t\t Show this help message and exit." echo -e "\t-h,\t\t Show this help message and exit."
echo -e "\t-p PROFILE,\t Path to your Firefox profile (if different than the dir of this script)" echo -e "\t-p PROFILE,\t Path to your Firefox profile (if different than the dir of this script)"
@ -91,6 +92,7 @@ usage() {
echo -e "\t-n,\t\t Do not append any overrides, even if user-overrides.js exists." echo -e "\t-n,\t\t Do not append any overrides, even if user-overrides.js exists."
echo -e "\t-v,\t\t Open the resulting user.js file." echo -e "\t-v,\t\t Open the resulting user.js file."
echo -e "\t-r,\t\t Only download user.js to a temporary file and open it." echo -e "\t-r,\t\t Only download user.js to a temporary file and open it."
echo -e "\t-e,\t\t Activate ESR related preferences."
echo -e echo -e
echo 'Deprecated Arguments (they still work for now):' echo 'Deprecated Arguments (they still work for now):'
echo -e "\t-donotupdate,\t Use instead -d" echo -e "\t-donotupdate,\t Use instead -d"
@ -304,6 +306,11 @@ update_userjs () {
mv "${newfile}" user.js mv "${newfile}" user.js
echo -e "Status: ${GREEN}user.js has been backed up and replaced with the latest version!${NC}" echo -e "Status: ${GREEN}user.js has been backed up and replaced with the latest version!${NC}"
if [ "$ESR" = true ]; then
sed -e 's/\/\* \(ESR[0-9]\{2,\}\.x still uses all.*\)/\/\/ \1/' user.js > user.js.tmp && mv user.js.tmp user.js
echo -e "Status: ${GREEN}ESR related preferences have been activated!${NC}"
fi
# apply overrides # apply overrides
if [ "$SKIPOVERRIDE" = false ]; then if [ "$SKIPOVERRIDE" = false ]; then
while IFS=',' read -ra FILE; do while IFS=',' read -ra FILE; do
@ -350,7 +357,7 @@ if [ $# != 0 ]; then
UPDATE='yes' UPDATE='yes'
legacy_argument $1 legacy_argument $1
else else
while getopts ":hp:ludsno:bcvr" opt; do while getopts ":hp:ludsno:bcvre" opt; do
case $opt in case $opt in
h) h)
usage usage
@ -385,6 +392,9 @@ if [ $# != 0 ]; then
v) v)
VIEW=true VIEW=true
;; ;;
e)
ESR=true
;;
r) r)
tfile=$(download_file 'https://raw.githubusercontent.com/ghacksuserjs/ghacks-user.js/master/user.js') tfile=$(download_file 'https://raw.githubusercontent.com/ghacksuserjs/ghacks-user.js/master/user.js')
mv $tfile "${tfile}.js" mv $tfile "${tfile}.js"