From 7e44cac244d241729bf21ddaa563346f64899771 Mon Sep 17 00:00:00 2001
From: Duy Lam <duylam@kms-technology.com>
Date: Thu, 10 Dec 2015 23:10:19 +0700
Subject: [PATCH] Migrate Firefox package tool from cfx to jpm

---
 gulpfile.babel.js               | 4 +++-
 package.json                    | 5 +++--
 src/config/firefox/package.json | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index 32acdac..e76034c 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -115,7 +115,9 @@ gulp.task('firefox', ['firefox:js'], () => {
 })
 
 gulp.task('firefox:xpi', (cb) => {
-  $.run('cd ./tmp/firefox && cfx xpi --output-file=../../dist/firefox.xpi').exec(cb)
+  // TODO: waiting for --output-file option to be merged
+  // The PR is at https://github.com/mozilla-jetpack/jpm/pull/344
+  $.run('cd ./tmp/firefox && jpm xpi && mv jid1-Om7eJGwA1U8Akg*.xpi ../../dist/firefox.xpi').exec(cb)
 })
 
 // Safari
diff --git a/package.json b/package.json
index 1462084..8cd0791 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,9 @@
   "description": "Display GitHub code in tree format",
   "main": "inject.js",
   "scripts": {
-    "test": "gulp test"
+    "test": "gulp test",
+    "dist": "gulp dist",
+    "preinstall": "npm i -g jpm gulp"
   },
   "repository": {
     "type": "git",
@@ -23,7 +25,6 @@
     "crx": "^0.4.4",
     "event-stream": "*",
     "firefox-profile": "~0.3.6",
-    "gulp": "^3.9.0",
     "gulp-autoprefixer": "0.0.8",
     "gulp-babel": "^6.1.0",
     "gulp-clean": "^0.3.1",
diff --git a/src/config/firefox/package.json b/src/config/firefox/package.json
index 71f3bde..b136f05 100644
--- a/src/config/firefox/package.json
+++ b/src/config/firefox/package.json
@@ -1,7 +1,7 @@
 {
   "name": "octotree",
   "title": "Octotree",
-  "id": "jid1-Om7eJGwA1U8Akg",
+  "id": "jid1-Om7eJGwA1U8Akg@jetpack",
   "description": "Display GitHub code in tree format",
   "author": "Buu Nguyen",
   "homepage": "https://github.com/buunguyen/octotree",