From 65fd1b7c473054e2e77b17caf1c8e88973697909 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 24 Mar 2016 21:37:33 +0000
Subject: [PATCH 1/4] correct highlighting for bash config files

---
 plugins/c9.ide.ace/ace.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.ide.ace/ace.js b/plugins/c9.ide.ace/ace.js
index ff712657..b2da9718 100644
--- a/plugins/c9.ide.ace/ace.js
+++ b/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)) {

From 1e3b0058f5c00d0dfa055612706bf2ac74f8d651 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 24 Mar 2016 22:39:44 +0000
Subject: [PATCH 2/4] fix share dialog displaying wrong error message

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

diff --git a/package.json b/package.json
index ba0755ad..c81ec7db 100644
--- a/package.json
+++ b/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": "#19b04b331b",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From b59d55d0e80d715db6fdf2861dfcb36a817c0af6 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 24 Mar 2016 22:40:35 +0000
Subject: [PATCH 3/4] fix raygun error

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

diff --git a/package.json b/package.json
index c81ec7db..f41556a2 100644
--- a/package.json
+++ b/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": "#19b04b331b",
+        "c9.ide.collab": "#7d3d49fa8e",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

From ab69dc8d239ad96b93520795a24777222d0a72f9 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 25 Mar 2016 01:37:23 +0000
Subject: [PATCH 4/4] tweak plugin installer

---
 package.json                      | 2 +-
 plugins/c9.cli.publish/publish.js | 4 ++++
 plugins/c9.core/ext.js            | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f41556a2..5398748e 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/plugins/c9.cli.publish/publish.js b/plugins/c9.cli.publish/publish.js
index d3efede7..3c8551c9 100644
--- a/plugins/c9.cli.publish/publish.js
+++ b/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))
diff --git a/plugins/c9.core/ext.js b/plugins/c9.core/ext.js
index d8a1e866..5768c28a 100644
--- a/plugins/c9.core/ext.js
+++ b/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 {