Merge pull request +13049 from c9/fix/various

Fix ssh workspace issues and several small fixes

package.json

@@ -67,7 +67,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#4b329741b1",
         "c9.ide.language.codeintel": "#871d8e5e5d",
-        "c9.ide.collab": "#11a0d3c5ce",
+        "c9.ide.collab": "#7d3d49fa8e",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",
@@ -90,7 +90,7 @@
         "c9.ide.help.support": "#af5c4055b2",
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#19758abe08",
-        "c9.ide.installer": "#0fde9f0067",
+        "c9.ide.installer": "#cad8f8316d",
         "c9.ide.language.python": "#330b80e3b2",
         "c9.ide.language.go": "#6ce1c7a7ef",
         "c9.ide.mount": "#4c39359b87",

plugins/c9.cli.publish/publish.js

@@ -653,6 +653,10 @@ define(function(require, exports, module) {
                                 p = "/" + normalizePath(Path.relative(cwd, p));
                                 excludeMap[p] = 1;
                             });
+                            // keep installer in both packed and unpacked form
+                            if (json.installer)
+                                excludeMap["/" + normalizePath(Path.relative(cwd, json.installer))] = 0;
+                            
                             copy(cwd, cwd + "/.c9/.build", {
                                 exclude: function(name, parent) {
                                     if (excludeRe.test(name))

plugins/c9.core/ext.js

@@ -577,7 +577,7 @@ define(function(require, exports, module) {
             
             function setAPIKey(apikey){
                 // Validate Key
-                if (!apikey || !apikey.match(/[\w+]{27}=/))
+                if (!apikey || !apikey.match(/^.{27}=$/))
                     throw new Error("Invalid API key");
                 
                 return {

plugins/c9.ide.ace/ace.js

@@ -1444,7 +1444,7 @@ define(function(require, exports, module) {
             else if (/^{/.test(firstLine)) {
                 syntax = "json";
             }
-            else if (/\.(bashrc|inputrc)$/.test(path)) {
+            else if (/\.(bash|inputrc|profile|zsh)/.test(path)) {
                 syntax = "sh";
             }
             else if (/\.(git(attributes|config|ignore)|npmrc)$/.test(path)) {