Merge pull request +9379 from c9/fix/various

Fix windows line endings and several small issues
pull/199/head
Tim Robinson 2015-09-14 18:26:08 +02:00
commit 2f9033a62c
2 zmienionych plików z 7 dodań i 5 usunięć

Wyświetl plik

@ -66,7 +66,7 @@
"c9.ide.language.javascript.tern": "#ad1d9b1b3a", "c9.ide.language.javascript.tern": "#ad1d9b1b3a",
"c9.ide.language.javascript.infer": "#8478e3c702", "c9.ide.language.javascript.infer": "#8478e3c702",
"c9.ide.language.jsonalyzer": "#83646961c7", "c9.ide.language.jsonalyzer": "#83646961c7",
"c9.ide.collab": "#6cceb3f95d", "c9.ide.collab": "#a8e597ae5e",
"c9.ide.local": "#a9703b630c", "c9.ide.local": "#a9703b630c",
"c9.ide.find": "#35379124ca", "c9.ide.find": "#35379124ca",
"c9.ide.find.infiles": "#c132ad243c", "c9.ide.find.infiles": "#c132ad243c",

Wyświetl plik

@ -143,10 +143,12 @@ installGlobalDeps() {
############################################################################ ############################################################################
export C9_DIR="$HOME"/.c9 export C9_DIR="$HOME"/.c9
if [[ $os == "windows" ]]; then if ! [[ `which npm` ]]; then
export PATH="$C9_DIR:$C9_DIR/node_modules/.bin:$PATH" if [[ $os == "windows" ]]; then
else export PATH="$C9_DIR:$C9_DIR/node_modules/.bin:$PATH"
export PATH="$C9_DIR/node/bin:$C9_DIR/node_modules/.bin:$PATH" else
export PATH="$C9_DIR/node/bin:$C9_DIR/node_modules/.bin:$PATH"
fi
fi fi
NPM=npm NPM=npm
NODE=node NODE=node