Abrowser: fixed issue with custom searchplugins.conf

helpers/DATA/firefox/searchplugins/searchplugins.conf

@@ -1,83 +0,0 @@
-{
-  "overrides": [
-    {
-      "name": "Amazon",
-       "include_locales": [ "af", "ar", "as", "az", "bg", "bn-IN", "br", "cak", "cy", "da", "de", "el", "en-GB", "en-US", "en-ZA", "eo", "es-AR", "eu", "fa", "fr", "ga-IE", "gd", "gl", "gn", "hr", "hsb", "hy-AM", "ia", "is", "it", "ja", "ka", "km", "kn", "ku", "lt", "mk", "mr", "ms", "my", "nb-NO", "nn-NO", "or", "pt-PT", "ro", "si", "son", "sq", "sr", "te", "th", "ur", "uz", "zh-CN", "zu"],
-      "exclude_locales": [],
-      "match": "amazondotcom.xml",
-      "source": "en-US/amazondotcom.xml",
-      "locale_specific": [
-        {
-          "locales": [ "br", "fr", "son" ],
-          "match": "amazon-france.xml",
-          "source": "fr/amazon-france.xml"
-        },
-        {
-          "locales": [ "cy", "da", "el", "en-GB", "eu", "ga-IE", "gd", "gl", "hr", "nb-NO", "nn-NO", "pt-PT", "sq", "sr" ],
-          "match": "amazon-en-GB.xml",
-          "source": "en-GB/amazon-en-GB.xml"
-        },
-        {
-          "locales": [ "de", "hsb" ],
-          "match": "amazondotcom-de.xml",
-          "source": "de/amazondotcom-de.xml"
-        },
-        {
-          "locales": [ "it" ],
-          "match": "amazon-it.xml",
-          "source": "it/amazon-it.xml"
-        },
-        {
-          "locales": [ "ja" ],
-          "match": "amazon-jp.xml",
-          "source": "ja/amazon-jp.xml"
-        },
-        {
-          "locales": [ "ur" ],
-          "match": "amazon-in.xml",
-          "source": "ur/amazon-in.xml"
-        },
-        {
-          "locales": [ "zh-CN" ],
-          "match": "amazondotcn.xml",
-          "source": "zh-CN/amazondotcn.xml"
-        }
-      ]
-    },
-    {
-      "name": "Baidu",
-      "include_locales": [ "zh-CN" ],
-      "exclude_locales": [],
-      "match": "baidu*.xml",
-      "source": "zh-CN/baidu.xml"
-    },
-    {
-      "name": "DuckDuckGo",
-      "include_locales": [ "*" ],
-      "exclude_locales": [],
-      "match": "ddg*.xml",
-      "source": "en-US/duckduckgo.xml"
-    },
-    {
-      "name": "Google",
-      "include_locales": [ "*" ],
-      "exclude_locales": [],
-      "match": "google.xml",
-      "source": "en-US/google.xml"
-    }
-  ],
-  "additions": [
-    {
-      "name": "Trisquel",
-      "include_locales": [ "*" ],
-      "exclude_locales": [],
-      "source": "en-US/trisquel.xml"
-    },
-    {
-      "name": "Trisquel packages",
-      "include_locales": [ "*" ],
-      "exclude_locales": [],
-      "source": "en-US/trisquel-packages.xml"
-    }
-  ]
-}

helpers/make-firefox

@@ -179,7 +179,24 @@ cp $DATA/bookmarks.html.in browser/locales/generic/profile/bookmarks.html.in
 
 #Trisquel custom search engines
 cp $DATA/searchplugins/*.xml debian/searchplugins/
-cp $DATA/searchplugins/searchplugins.conf debian/config/
+sed '/additions/,$d' debian/config/searchplugins.conf
+cat << EOF >> debian/config/searchplugins.conf
+  "additions": [
+    {
+      "name": "Trisquel",
+      "include_locales": [ "*" ],
+      "exclude_locales": [],
+      "source": "en-US/trisquel.xml"
+    },
+    {
+      "name": "Trisquel packages",
+      "include_locales": [ "*" ],
+      "exclude_locales": [],
+      "source": "en-US/trisquel-packages.xml"
+    }
+  ]
+}
+EOF
 
 # install extensions
 for extension in $(ls -1 $DATA/extensions/); do