summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2020-06-21 12:34:24 -0400
committerAndrew Cady <d@jerkface.net>2020-06-21 12:34:24 -0400
commitc41f50890836f8b0c626716674b80e5f629550f8 (patch)
tree35d7c451f7982acb715390eff27df225398c3172
parent08f33f20911b08cf075217fb0c569bfbd418d78f (diff)
improve error handling
-rw-r--r--firefox-sideloader/functions.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/firefox-sideloader/functions.sh b/firefox-sideloader/functions.sh
index 2934c09..eb7a9a9 100644
--- a/firefox-sideloader/functions.sh
+++ b/firefox-sideloader/functions.sh
@@ -69,7 +69,7 @@ filter()
69copy_json_file_with_filter() 69copy_json_file_with_filter()
70{ 70{
71 which mozlz4 >/dev/null || PATH=$HOME/.cargo/bin:$PATH 71 which mozlz4 >/dev/null || PATH=$HOME/.cargo/bin:$PATH
72 which mozlz4 >/dev/null || exit 1 72 which mozlz4 >/dev/null || return
73 local new="$1" old="$2" f="$3" filter_json 73 local new="$1" old="$2" f="$3" filter_json
74 filter_json="s/${old//\//\\/}/${new//\//\\/}/g" 74 filter_json="s/${old//\//\\/}/${new//\//\\/}/g"
75 [ -d "$old" -a -d "$new" ] || return 75 [ -d "$old" -a -d "$new" ] || return
@@ -133,8 +133,8 @@ clone_profile_raw()
133 133
134 cp -r --preserve=mode,timestamps -t "$new_profile_dir" -- "$old_profile_dir"/{extensions/,extension-{setting,preference}s.json} || return 134 cp -r --preserve=mode,timestamps -t "$new_profile_dir" -- "$old_profile_dir"/{extensions/,extension-{setting,preference}s.json} || return
135 135
136 copy_json_file_with_filter "$new_profile_dir" "$old_profile_dir" 'extensions.json' 136 copy_json_file_with_filter "$new_profile_dir" "$old_profile_dir" 'extensions.json' || return
137 copy_json_file_with_filter "$new_profile_dir" "$old_profile_dir" 'addonStartup.json.lz4' 137 copy_json_file_with_filter "$new_profile_dir" "$old_profile_dir" 'addonStartup.json.lz4' || return
138 138
139 prefs 139 prefs
140} 140}