From d051370e4b6ccda7f814c54aeb04d190dde96c3e Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian@c9.io>
Date: Thu, 4 Feb 2016 14:57:53 +0000
Subject: [PATCH 1/2] ignore node_modules

---
 .gitignore      |  1 +
 b9/b9           |  7 +++++--
 b9/lib/_init.sh | 22 +---------------------
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf6e349e..68173967 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ build/*/
 build/*.zip
 build/*.exe
 build/*.tgz
+b9/lib/js/node_modules/
 docs/generate/lib/node_modules
 plugins/c9.ide.layout.classic/less/*.css
 plugins/c9.vfs.standalone/www/less.html
diff --git a/b9/b9 b/b9/b9
index 0112745a..2c5265e5 100755
--- a/b9/b9
+++ b/b9/b9
@@ -16,8 +16,7 @@ B9=$B9_DIR/b9
 
 source ./lib/_init.sh 
 
-NODEJS=$(_b9_init_nodejs)
-NPM=$(_b9_init_npm)
+NODEJS="$(_b9_init_nodejs)"
 
 TMPDIR=$(_b9_init_temp)
 TMP=$TMPDIR
@@ -44,6 +43,7 @@ usage() {
     echo "[Deployment]"
     echo "    package                     Package and upload version of Cloud9"
     echo "    deploy                      Deploy a Cloud9 version"
+    echo "    static                      Package static assets"
     echo ""
     echo "[Internal]"
     echo "    check                       Run b9 tests"
@@ -76,6 +76,9 @@ case $ORIGINAL_COMMAND in
     deploy)
         COMMAND=b9_deploy
         ;;
+    static)
+        COMMAND=b9_static
+        ;;
     prepare)
         COMMAND=b9_prepare
         ;;
diff --git a/b9/lib/_init.sh b/b9/lib/_init.sh
index 7ddde70d..c4a623e3 100644
--- a/b9/lib/_init.sh
+++ b/b9/lib/_init.sh
@@ -35,31 +35,11 @@ _b9_init_nodejs() {
     echo $NODEJS
 }
 
-_b9_init_npm() {
-    local NPM
-    
-    . ~/.nvm/nvm.sh &> /dev/null || :
-    for NPM in $(which npm) /usr/local/bin/npm /usr/bin/npm; do
-        [ -x $NPM ] && break
-        NPM=""
-    done
-    
-    if [ -z "$NPM" ]; then
-        echo "Can't find npm executable" 1>&2
-        exit 1
-    fi
-    
-    echo $NPM
-}
-
 _B9_NODE_HELPER_INITIALIZED=0
 
 _b9_init_node_helper() {
     [ "$_B9_NODE_HELPER_INITIALIZED" == "1" ] && return
     _B9_NODE_HELPER_INITIALIZED=1
     
-    pushd $B9_DIR/lib/js &> /dev/null
-    rm -rf node_modules
-    $NPM install
-    popd &> /dev/null
+    _b9_npm $B9_DIR/lib/js install
 }
\ No newline at end of file

From d765a8cfc67b82ed4f9b81f5eeeb5d19efe61f14 Mon Sep 17 00:00:00 2001
From: Fabian Jakobs <fabian@c9.io>
Date: Thu, 4 Feb 2016 15:05:21 +0000
Subject: [PATCH 2/2] rever npm change

---
 b9/b9           |  1 +
 b9/lib/_init.sh | 22 +++++++++++++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/b9/b9 b/b9/b9
index 2c5265e5..47216b9c 100755
--- a/b9/b9
+++ b/b9/b9
@@ -17,6 +17,7 @@ B9=$B9_DIR/b9
 source ./lib/_init.sh 
 
 NODEJS="$(_b9_init_nodejs)"
+NPM="$(_b9_init_npm)"
 
 TMPDIR=$(_b9_init_temp)
 TMP=$TMPDIR
diff --git a/b9/lib/_init.sh b/b9/lib/_init.sh
index c4a623e3..726ad082 100644
--- a/b9/lib/_init.sh
+++ b/b9/lib/_init.sh
@@ -35,11 +35,31 @@ _b9_init_nodejs() {
     echo $NODEJS
 }
 
+_b9_init_npm() {
+    local NPM
+    
+    . ~/.nvm/nvm.sh &> /dev/null || :
+    for NPM in $(which npm) /usr/local/bin/npm /usr/bin/npm; do
+        [ -x $NPM ] && break
+        NPM=""
+    done
+    
+    if [ -z "$NPM" ]; then
+        echo "Can't find npm executable" 1>&2
+        exit 1
+    fi
+    
+    echo $NODEJS $NPM
+}
+
 _B9_NODE_HELPER_INITIALIZED=0
 
 _b9_init_node_helper() {
     [ "$_B9_NODE_HELPER_INITIALIZED" == "1" ] && return
     _B9_NODE_HELPER_INITIALIZED=1
     
-    _b9_npm $B9_DIR/lib/js install
+    pushd $B9_DIR/lib/js &> /dev/null
+    rm -rf node_modules
+    $NPM install
+    popd &> /dev/null
 }
\ No newline at end of file