diff --git a/package.json b/package.json index b7203d5e..48d1496d 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", 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