Merge remote-tracking branch 'origin/master' into api-ide-profile-add-sshprvkey

integrations/scripts/update.sh

@@ -5,7 +5,7 @@ cd `dirname $0`/..
 # set -x
 NAME=$1
 shift 
-BRANCH=
+BRANCH=master
 URL=
 for i in "$@"; do
     case $i in
@@ -56,7 +56,7 @@ popd
 node -e '
     var name = "'$NAME'";
     var url = "'$URL'";
-    var hash = "'$HASH'"
+    var hash = "'$HASH'".trim();
     var fs = require("fs");
     
     function updateJSON(path, fn) {
@@ -81,13 +81,13 @@ node -e '
     updateJSON("../package.json", function(package) {
         var deps = package.dependencies;
         console.log(deps[name], hash)
-        deps[name] = deps[name].replace(/#[a-f\d]+$/i, "#" + hash)
+        deps[name] = deps[name].replace(/#[a-f\d]*$/i, "#" + hash)
         console.log(deps[name], hash)
     });
     updateJSON("../npm-shrinkwrap.json", function(package) {
         var deps = package.dependencies;
-        deps[name].from = deps[name].from.replace(/#[a-f\d]+$/i, "#" + hash);
-        deps[name].resolved = deps[name].resolved.replace(/#[a-f\d]+$/i, "#" + hash);
+        deps[name].from = deps[name].from.replace(/#[a-f\d]*$/i, "#" + hash);
+        deps[name].resolved = deps[name].resolved.replace(/#[a-f\d]*$/i, "#" + hash);
     });
 '
 

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2968",
+    "version": "3.1.2973",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -16,7 +16,7 @@
         "connect": "~2.12.0",
         "debug": "~0.7.4",
         "ejs": "~1.0.0",
-        "emmet": "git://github.com/cloud9ide/emmet-core.git#2ff6dc06ad",
+        "emmet": "https://github.com/cloud9ide/emmet-core.git#2ff6dc06ad",
         "engine.io": "1.6.9",
         "engine.io-client": "1.6.9",
         "jsonm": "1.0.6",