Merge pull request +7504 from c9/sdk

Misc fixes for sdk

package.json

@@ -66,7 +66,7 @@
         "c9.ide.language.javascript.eslint": "#2db744b1a3",
         "c9.ide.language.javascript.tern": "#2b0bb024da",
         "c9.ide.language.javascript.infer": "#cfec494a3c",
-        "c9.ide.language.jsonalyzer": "#c253f093a0",
+        "c9.ide.language.jsonalyzer": "#ba3e0d298c",
         "c9.ide.collab": "#47a290ae37",
         "c9.ide.local": "#a9703b630c",
         "c9.ide.find": "#6cc6d3379d",

plugins/c9.cli.publish/list.js

@@ -59,7 +59,7 @@ define(function(require, exports, module) {
         }
         
         function pad(str, nr){
-            return str + Array(nr - str.length).join(" ");
+            return str + Array(Math.max(0, nr - str.length)).join(" ");
         }
         
         function list(asJson, callback){

plugins/c9.ide.tree/tree.js

@@ -247,7 +247,7 @@ define(function(require, exports, module) {
             fsCache.model.getTooltipText = function(node) {
                 var size = node.size;
                 return node.label + (node.link ? " => " + node.link  + "\n" : "")
-                    + (size ? " | " + (
+                    + (size && !node.isFolder ? " | " + (
                         size < 0x400 ? size + " bytes" :
                         size < 0x100000 ? (size / 0x400).toFixed(2) + "KB" :
                             (size / 0x100000).toFixed(2) + "MB"

scripts/setup-local-dev.sh

@@ -71,13 +71,15 @@ fi
 
 if [ "$os" == "windows" ]; then
     NODE_VERSION=v0.12.2
-    NW_VERSION=v0.12.1
-    
+    NW_VERSION=v0.12.2
+    # TODO find a more reliable place to put c9 dependencies
+    HOME="$HOMEDRIVE$HOMEPATH"
     pushd build
-    if [ ! -f "$HOME/.c9/"node.exe ]; then
+    if [ ! -f "$HOME/.c9/"node.exe ] || [ ! -d "$HOME/.c9/"msys ]; then
         echo "downloading node"
         pushd "$HOME/.c9/"
-        curl -OL http://nodejs.org/dist/$NODE_VERSION/node.exe
+        curl -L https://raw.githubusercontent.com/cloud9ide/sdk-deps-win32/master/install.sh | bash
+        # bash $SOURCE/../sdk-deps-win32/install.sh # for testing
         popd
     fi