From 3251959e4eefa5deb801bd22abbb739074aee321 Mon Sep 17 00:00:00 2001
From: Shourai <10200748+Shourai@users.noreply.github.com>
Date: Sun, 11 Mar 2018 15:23:06 +0100
Subject: [PATCH] More thorough regex for internal UUID finder

---
 internal_UUID_finder.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/internal_UUID_finder.sh b/internal_UUID_finder.sh
index 75a1e44..f9cc9de 100755
--- a/internal_UUID_finder.sh
+++ b/internal_UUID_finder.sh
@@ -25,7 +25,7 @@ declare -A styled=( ["brief@mozdev.org"]="brief"
                     ["vim-vixen@i-beam.org"]="vim_vixen"
                   )
 
-line=$(sed -n -e '/^user_pref("extensions.webextensions.uuids"/p' ../prefs.js)
+line=$(sed -n -e 's/^user_pref("extensions.webextensions.uuids", "{\(.*\).*}");/\1/p' "$profile/prefs.js")
 
 ## Remove prefix and suffix
 prefix='user_pref("extensions.webextensions.uuids", "{'
@@ -37,12 +37,8 @@ suffix='\\"'
 
 IFS=',' read -ra EXTS <<< "$line"
 for i in "${EXTS[@]}"; do
-    id=${i%:*}
-    uuid=${i#*:}
-    id=${id#$prefix}
-    id=${id%$suffix}
-    uuid=${uuid#$prefix}
-    uuid=${uuid%$suffix}
+    id=$(echo $i | sed -n 's/.*"\(.*\)\\":.*/\1/p')
+    uuid=$(echo $i | sed -n 's/.*"\(.*\)\\".*/\1/p')
     if test "${styled[$id]+isset}"
     then
         echo "${styled[$id]}_UUID=$uuid" >> 'ShadowFox_customization/internal_UUIDs.txt'