Merge pull request #31 from rickpastoor/fix/firefox-format

Fix Firefox version

config

@@ -1 +1 @@
-export SCRUMMER_VERSION="0.24"
+export SCRUMMER_VERSION="0.25"

platform/firefox/manifest.json

@@ -0,0 +1,24 @@
+{
+	"name": "Scrummer",
+	"version": "SCRUMMER_VERSION",
+	"description": "Adds Storypoints to Trello",
+	"content_scripts": [
+		{
+      "run_at": "document_end",
+			"matches": ["https://trello.com/*"],
+			"js": ["scrummer.js"],
+			"css": ["scrummer.css"]
+		}
+	],
+	"manifest_version" : 2,
+  "applications": {
+    "gecko": {
+      "id": "scrummer@jetpack"
+    }
+  },
+	"icons": {
+		"48": "img/icon48.png",
+		"128": "img/icon128.png",
+		"1024": "img/icon1024.png"
+	}
+}

tools/make-chromium.sh

@@ -4,7 +4,6 @@
 
 source ./config
 
-echo "*** scrummer(Chromium): Creating package"
 echo "*** scrummer(Chromium): Copying files"
 
 DES=./dist/build/scrummer.chromium

tools/make-firefox.sh

@@ -6,26 +6,24 @@ source ./config
 
 echo "*** scrummer.firefox: Copying files"
 
-DES=dist/build/scrummer.firefox
+DES=./dist/build/scrummer.firefox
 rm -rf $DES
 mkdir -p $DES
-mkdir -p $DES/data
+mkdir -p $DES/img/
 
-cp -R src/*                             $DES/data
-cp    platform/firefox/index.js         $DES/
-cp    platform/firefox/package.json     $DES/
-cp -R platform/chromium/img             $DES/
-mv    $DES/img/icon128.png              $DES/icon.png
+cp -R ./src/*                             $DES/
+cp -R ./platform/chromium/img/*           $DES/img
+cp    ./platform/firefox/manifest.json    $DES/
 
 # Replace version
-sed -i.bak 's/SCRUMMER_VERSION/'$SCRUMMER_VERSION'/g' $DES/package.json
-rm $DES/package.json.bak
+sed -i.bak 's/SCRUMMER_VERSION/'$SCRUMMER_VERSION'/g' $DES/manifest.json
+rm $DES/manifest.json.bak
 
 if [ "$1" = all ]; then
     echo "*** scrummer.firefox: Creating package..."
-    pushd $DES/
-    jpm xpi
-    mv ./scrummer.xpi ./../scrummer.firefox.xpi
+    pushd $(dirname $DES/)
+    zip scrummer.firefox.xpi -qr $(basename $DES/)
+    popd
 fi
 
 echo "*** scrummer.firefox: Package done."