From bca670e647485ee64797c4e8e15f79f7ccca2bb1 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 14 Sep 2015 10:59:13 +0000
Subject: [PATCH 1/2] use global node when available

---
 scripts/install-sdk.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/install-sdk.sh b/scripts/install-sdk.sh
index 3f1a6a8c..70f0eb11 100755
--- a/scripts/install-sdk.sh
+++ b/scripts/install-sdk.sh
@@ -143,10 +143,12 @@ installGlobalDeps() {
 
 ############################################################################
 export C9_DIR="$HOME"/.c9
-if [[ $os == "windows" ]]; then
-    export PATH="$C9_DIR:$C9_DIR/node_modules/.bin:$PATH"
-else
-    export PATH="$C9_DIR/node/bin:$C9_DIR/node_modules/.bin:$PATH"
+if ! [[ `which npm` ]]; then
+    if [[ $os == "windows" ]]; then
+        export PATH="$C9_DIR:$C9_DIR/node_modules/.bin:$PATH"
+    else
+        export PATH="$C9_DIR/node/bin:$C9_DIR/node_modules/.bin:$PATH"
+    fi
 fi
 NPM=npm
 NODE=node

From f4bda60e77d4958a6c37d340f7765c106f5c303c Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Mon, 14 Sep 2015 17:53:26 +0400
Subject: [PATCH 2/2] fix +8966 windows Line Endings not handled properly in
 collab

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fbf90281..f5e39999 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "c9.ide.language.javascript.tern": "#ad1d9b1b3a",
         "c9.ide.language.javascript.infer": "#8478e3c702",
         "c9.ide.language.jsonalyzer": "#83646961c7",
-        "c9.ide.collab": "#6cceb3f95d",
+        "c9.ide.collab": "#a8e597ae5e",
         "c9.ide.local": "#a9703b630c",
         "c9.ide.find": "#35379124ca",
         "c9.ide.find.infiles": "#c132ad243c",