From 4b7187dc26d0edfd6fc6b4f9c4ed70fc70a3ce2c Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 12:34:45 +0200
Subject: [PATCH 01/13] Support for demeteorizer

---
 bin/compile | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/bin/compile b/bin/compile
index ac8d04927..7ffd75b65 100755
--- a/bin/compile
+++ b/bin/compile
@@ -109,6 +109,14 @@ echo "-----> Installing meteorite with npm"
 run_npm "install meteorite -g"
 echo "Meteorite installed" | indent
 
+############################################
+# install demeteorizer
+############################################
+echo "-----> Installing demeteorizer with npm"
+
+run_npm "install demeteorizer -g"
+echo "Demeteorizer installed" | indent
+
 METEOR_BUILD_DIR="$BUILD_DIR/.meteor/heroku_build"
 mkdir -p "$HOME"
 ############################################
@@ -126,10 +134,14 @@ echo "Meteor installed" | indent
 echo "Installing packages" | indent
 HOME="$BUILD_DIR" mrt install | indent
 echo "Building meteor bundle" | indent
-HOME="$VENDORED_METEOR" "$VENDORED_METEOR"/.meteor/meteor bundle "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
+
+#HOME="$VENDORED_METEOR" "$VENDORED_METEOR"/.meteor/meteor bundle "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
+
+HOME="$VENDORED_METEOR" "demeteorizer --tarball $CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
 mkdir -p "$METEOR_BUILD_DIR"/app
-tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app
+#tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app
+tar -zxf "$CACHE_DIR"/bundle.tar.gz -C "$METEOR_BUILD_DIR"/app
 rm "$CACHE_DIR"/bundle.tar.gz
 ############################################
 

From a316e2fae43c4c706d9504675fa35b3b952f0466 Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 12:38:32 +0200
Subject: [PATCH 02/13] Update for demeteorizer

---
 bin/compile | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bin/compile b/bin/compile
index 7ffd75b65..07f89d6ac 100755
--- a/bin/compile
+++ b/bin/compile
@@ -112,7 +112,7 @@ echo "Meteorite installed" | indent
 ############################################
 # install demeteorizer
 ############################################
-echo "-----> Installing demeteorizer with npm"
+echo "-----> Installing demeteorizer with npm" | indent
 
 run_npm "install demeteorizer -g"
 echo "Demeteorizer installed" | indent
@@ -143,6 +143,17 @@ mkdir -p "$METEOR_BUILD_DIR"/app
 #tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app
 tar -zxf "$CACHE_DIR"/bundle.tar.gz -C "$METEOR_BUILD_DIR"/app
 rm "$CACHE_DIR"/bundle.tar.gz
+
+############################################
+## npm install
+############################################
+
+echo "Installing npm modules"
+cd "$METEOR_BUILD_DIR"/app
+run_npm "install"
+
+echo "Installed npm modules" | indent
+
 ############################################
 
 ############################################

From ee72e150e50161c2f0375bd033af223d5eb35463 Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 12:51:57 +0200
Subject: [PATCH 03/13] Update compile

---
 bin/compile | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/bin/compile b/bin/compile
index 07f89d6ac..b9e60e2e2 100755
--- a/bin/compile
+++ b/bin/compile
@@ -112,7 +112,7 @@ echo "Meteorite installed" | indent
 ############################################
 # install demeteorizer
 ############################################
-echo "-----> Installing demeteorizer with npm" | indent
+echo "-----> Installing demeteorizer with npm"
 
 run_npm "install demeteorizer -g"
 echo "Demeteorizer installed" | indent
@@ -137,23 +137,12 @@ echo "Building meteor bundle" | indent
 
 #HOME="$VENDORED_METEOR" "$VENDORED_METEOR"/.meteor/meteor bundle "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
-HOME="$VENDORED_METEOR" "demeteorizer --tarball $CACHE_DIR"/bundle.tar.gz 2>&1 | indent
+HOME="$BUILD_DIR" "demeteorizer --tarball" "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
 mkdir -p "$METEOR_BUILD_DIR"/app
 #tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app
 tar -zxf "$CACHE_DIR"/bundle.tar.gz -C "$METEOR_BUILD_DIR"/app
 rm "$CACHE_DIR"/bundle.tar.gz
-
-############################################
-## npm install
-############################################
-
-echo "Installing npm modules"
-cd "$METEOR_BUILD_DIR"/app
-run_npm "install"
-
-echo "Installed npm modules" | indent
-
 ############################################
 
 ############################################

From 3d331c802fd9ca4ad9188aa79cdbd720e3e2f434 Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 13:17:03 +0200
Subject: [PATCH 04/13] Update compile

---
 bin/compile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/compile b/bin/compile
index b9e60e2e2..2fdbfa793 100755
--- a/bin/compile
+++ b/bin/compile
@@ -137,6 +137,9 @@ echo "Building meteor bundle" | indent
 
 #HOME="$VENDORED_METEOR" "$VENDORED_METEOR"/.meteor/meteor bundle "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
+echo "Running ${BUILD_DIR}"
+echo "Running in ${$CACHE_DIR}"
+
 HOME="$BUILD_DIR" "demeteorizer --tarball" "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
 mkdir -p "$METEOR_BUILD_DIR"/app

From d300960cafdded05201963113ed12cd572ccdf75 Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 13:40:46 +0200
Subject: [PATCH 05/13] Update compile

---
 bin/compile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/bin/compile b/bin/compile
index 2fdbfa793..9d8ca74af 100755
--- a/bin/compile
+++ b/bin/compile
@@ -109,14 +109,6 @@ echo "-----> Installing meteorite with npm"
 run_npm "install meteorite -g"
 echo "Meteorite installed" | indent
 
-############################################
-# install demeteorizer
-############################################
-echo "-----> Installing demeteorizer with npm"
-
-run_npm "install demeteorizer -g"
-echo "Demeteorizer installed" | indent
-
 METEOR_BUILD_DIR="$BUILD_DIR/.meteor/heroku_build"
 mkdir -p "$HOME"
 ############################################
@@ -140,6 +132,14 @@ echo "Building meteor bundle" | indent
 echo "Running ${BUILD_DIR}"
 echo "Running in ${$CACHE_DIR}"
 
+############################################
+# install demeteorizer
+############################################
+echo "-----> Installing demeteorizer with npm"
+
+run_npm "install demeteorizer -g"
+echo "Demeteorizer installed" | indent
+
 HOME="$BUILD_DIR" "demeteorizer --tarball" "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
 mkdir -p "$METEOR_BUILD_DIR"/app

From 7fa7520108caf1d4494560cf643a8488ef8356cb Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 13:50:13 +0200
Subject: [PATCH 06/13] Update compile

---
 bin/compile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/bin/compile b/bin/compile
index 9d8ca74af..ee228d9c6 100755
--- a/bin/compile
+++ b/bin/compile
@@ -129,9 +129,6 @@ echo "Building meteor bundle" | indent
 
 #HOME="$VENDORED_METEOR" "$VENDORED_METEOR"/.meteor/meteor bundle "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
-echo "Running ${BUILD_DIR}"
-echo "Running in ${$CACHE_DIR}"
-
 ############################################
 # install demeteorizer
 ############################################

From 935ae195e9f90badaed643f1a9b792ae62377755 Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 13:59:03 +0200
Subject: [PATCH 07/13] Update compile

---
 bin/compile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/compile b/bin/compile
index ee228d9c6..236dba506 100755
--- a/bin/compile
+++ b/bin/compile
@@ -134,10 +134,11 @@ echo "Building meteor bundle" | indent
 ############################################
 echo "-----> Installing demeteorizer with npm"
 
-run_npm "install demeteorizer -g"
+npm install demeteorizer -g
 echo "Demeteorizer installed" | indent
 
-HOME="$BUILD_DIR" "demeteorizer --tarball" "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
+cd $BUILD_DIR
+demeteorizer --tarball "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
 mkdir -p "$METEOR_BUILD_DIR"/app
 #tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app

From 01f5c5f83cbbc71ec319c063b22343fabedc2866 Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 14:08:58 +0200
Subject: [PATCH 08/13] Update compile

---
 bin/compile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/compile b/bin/compile
index 236dba506..c7393a056 100755
--- a/bin/compile
+++ b/bin/compile
@@ -138,7 +138,7 @@ npm install demeteorizer -g
 echo "Demeteorizer installed" | indent
 
 cd $BUILD_DIR
-demeteorizer --tarball "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
+HOME="$BUILD_DIR" demeteorizer --tarball "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
 mkdir -p "$METEOR_BUILD_DIR"/app
 #tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app

From ef3fb6b546d2ee7f544142440285977fbc178227 Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 14:23:25 +0200
Subject: [PATCH 09/13] Update compile

---
 bin/compile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/compile b/bin/compile
index c7393a056..1261e5a2b 100755
--- a/bin/compile
+++ b/bin/compile
@@ -138,7 +138,7 @@ npm install demeteorizer -g
 echo "Demeteorizer installed" | indent
 
 cd $BUILD_DIR
-HOME="$BUILD_DIR" demeteorizer --tarball "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
+HOME="$VENDORED_METEOR" demeteorizer --tarball "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
 mkdir -p "$METEOR_BUILD_DIR"/app
 #tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app

From 90d1cf2588e5c825954ba15c851ca076fe3f0aec Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 14:36:22 +0200
Subject: [PATCH 10/13] Update compile

---
 bin/compile | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bin/compile b/bin/compile
index 1261e5a2b..e8518a368 100755
--- a/bin/compile
+++ b/bin/compile
@@ -138,10 +138,20 @@ npm install demeteorizer -g
 echo "Demeteorizer installed" | indent
 
 cd $BUILD_DIR
+
+echo "Creating NodeJS bundle"
 HOME="$VENDORED_METEOR" demeteorizer --tarball "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
+echo "NodeJS bundle created" | indent
 
 mkdir -p "$METEOR_BUILD_DIR"/app
 #tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app
+
+echo "Installing npm modules"
+cd "$METEOR_BUILD_DIR"/app
+npm install
+echo "Package ready" | indent
+
+
 tar -zxf "$CACHE_DIR"/bundle.tar.gz -C "$METEOR_BUILD_DIR"/app
 rm "$CACHE_DIR"/bundle.tar.gz
 ############################################

From 4e612b7f85b90cfa66e149b845477046f9541e7a Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 14:47:19 +0200
Subject: [PATCH 11/13] Update compile

---
 bin/compile | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/bin/compile b/bin/compile
index e8518a368..db02d8b30 100755
--- a/bin/compile
+++ b/bin/compile
@@ -147,8 +147,12 @@ mkdir -p "$METEOR_BUILD_DIR"/app
 #tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app
 
 echo "Installing npm modules"
-cd "$METEOR_BUILD_DIR"/app
+
+
+cd $METEOR_BUILD_DIR
+cd app
 npm install
+
 echo "Package ready" | indent
 
 

From 042167e969110d6998ce9274e4d4fb82102bbee3 Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Sun, 13 Apr 2014 14:58:41 +0200
Subject: [PATCH 12/13] Update compile

---
 bin/compile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/compile b/bin/compile
index db02d8b30..8634cc41b 100755
--- a/bin/compile
+++ b/bin/compile
@@ -146,18 +146,21 @@ echo "NodeJS bundle created" | indent
 mkdir -p "$METEOR_BUILD_DIR"/app
 #tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app
 
-echo "Installing npm modules"
+tar -zxf "$CACHE_DIR"/bundle.tar.gz -C "$METEOR_BUILD_DIR"/app
+rm "$CACHE_DIR"/bundle.tar.gz
+############################################
+
+############################################
+# Install NPM Modules
+############################################
 
+echo "Installing npm modules"
 
 cd $METEOR_BUILD_DIR
 cd app
 npm install
 
 echo "Package ready" | indent
-
-
-tar -zxf "$CACHE_DIR"/bundle.tar.gz -C "$METEOR_BUILD_DIR"/app
-rm "$CACHE_DIR"/bundle.tar.gz
 ############################################
 
 ############################################

From a2a5e0670ad4d7a59d99420d9294ce7b687ab4b5 Mon Sep 17 00:00:00 2001
From: Tarang Patel <Tarangp@users.noreply.github.com>
Date: Tue, 15 Apr 2014 15:18:52 +0200
Subject: [PATCH 13/13] Update compile

---
 bin/compile | 38 ++++----------------------------------
 1 file changed, 4 insertions(+), 34 deletions(-)

diff --git a/bin/compile b/bin/compile
index 8634cc41b..8d4484ab6 100755
--- a/bin/compile
+++ b/bin/compile
@@ -106,7 +106,7 @@ export CPPPATH="$INCLUDE_PATH"
 ############################################
 echo "-----> Installing meteorite with npm"
 
-run_npm "install meteorite -g"
+npm install meteorite -g
 echo "Meteorite installed" | indent
 
 METEOR_BUILD_DIR="$BUILD_DIR/.meteor/heroku_build"
@@ -120,49 +120,19 @@ echo "Installing meteor" | indent
 
 # Using different folder to prevent install script form deleting packages file
 VENDORED_METEOR="$(mktmpdir meteor)"
-curl https://install.meteor.com | HOME="$VENDORED_METEOR" /bin/sh | indent
+curl https://install.meteor.com | /bin/sh | indent
 echo "Meteor installed" | indent
 
 echo "Installing packages" | indent
 HOME="$BUILD_DIR" mrt install | indent
 echo "Building meteor bundle" | indent
-
-#HOME="$VENDORED_METEOR" "$VENDORED_METEOR"/.meteor/meteor bundle "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
-
-############################################
-# install demeteorizer
-############################################
-echo "-----> Installing demeteorizer with npm"
-
-npm install demeteorizer -g
-echo "Demeteorizer installed" | indent
-
-cd $BUILD_DIR
-
-echo "Creating NodeJS bundle"
-HOME="$VENDORED_METEOR" demeteorizer --tarball "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
-echo "NodeJS bundle created" | indent
+meteor bundle "$CACHE_DIR"/bundle.tar.gz 2>&1 | indent
 
 mkdir -p "$METEOR_BUILD_DIR"/app
-#tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app
-
-tar -zxf "$CACHE_DIR"/bundle.tar.gz -C "$METEOR_BUILD_DIR"/app
+tar -zxf "$CACHE_DIR"/bundle.tar.gz --strip-components 1 -C "$METEOR_BUILD_DIR"/app
 rm "$CACHE_DIR"/bundle.tar.gz
 ############################################
 
-############################################
-# Install NPM Modules
-############################################
-
-echo "Installing npm modules"
-
-cd $METEOR_BUILD_DIR
-cd app
-npm install
-
-echo "Package ready" | indent
-############################################
-
 ############################################
 # Prepare ENV vars
 ############################################