Merge branch 'master' into nj/issue-5159-better

Gruntfile.js

@@ -142,7 +142,8 @@ module.exports = function (grunt) {
         shell: {
             repo: grunt.option("shell-repo") || "../brackets-shell",
             mac: "<%= shell.repo %>/installer/mac/staging/<%= pkg.name %>.app",
-            win: "<%= shell.repo %>/installer/win/staging/<%= pkg.name %>.exe"
+            win: "<%= shell.repo %>/installer/win/staging/<%= pkg.name %>.exe",
+            linux: "<%= shell.repo %>/installer/linux/debian/package-root/opt/brackets/brackets"
         }
     });
 

src/brackets.js

@@ -284,7 +284,8 @@ define(function (require, exports, module) {
         if (brackets.nativeMenus) {
             $("body").addClass("has-appshell-menus");
         } else {
-            // Prevent the menu item to grab the focus -- override focus implementation
+            // (issue #5310) workaround for bootstrap dropdown: prevent the menu item to grab
+            // the focus -- override jquery focus implementation for top-level menu items
             (function () {
                 var defaultFocus = $.fn.focus;
                 $.fn.focus = function () {

src/extensibility/Package.js

@@ -364,7 +364,11 @@ define(function (require, exports, module) {
      */
     function formatError(error) {
         function localize(key) {
-            return Strings[key] || Strings.UNKNOWN_ERROR;
+            if (Strings[key]) {
+                return Strings[key];
+            }
+            console.log("Unknown installation error", key);
+            return Strings.UNKNOWN_ERROR;
         }
 
         if (Array.isArray(error)) {

src/extensibility/node/ExtensionManagerDomain.js

@@ -33,8 +33,11 @@ var semver   = require("semver"),
     request  = require("request"),
     os       = require("os"),
     fs       = require("fs-extra"),
+    temp     = require("temp"),
     validate = require("./package-validator").validate;
 
+// Automatically clean up temp files on exit
+temp.track();
 
 var Errors = {
     API_NOT_COMPATIBLE: "API_NOT_COMPATIBLE",
@@ -102,7 +105,6 @@ function _performInstall(packagePath, installDirectory, validationResult, callba
         fs.copy(sourceDir, installDirectory, function (err) {
             if (err) {
                 _removeFailedInstallation(installDirectory);
-                fs.remove(validationResult.extractDir);
                 callback(err, null);
             } else {
                 // The status may have already been set previously (as in the
@@ -217,10 +219,21 @@ function _cmdInstall(packagePath, destinationDirectory, options, callback, _doUp
 
     var validateCallback = function (err, validationResult) {
         validationResult.localPath = packagePath;
+
+        // This is a wrapper for the callback that will delete the temporary
+        // directory to which the package was unzipped.
+        function deleteTempAndCallback(err) {
+            if (validationResult.extractDir) {
+                fs.remove(validationResult.extractDir);
+                delete validationResult.extractDir;
+            }
+            callback(err, validationResult);
+        }
+
         // If there was trouble at the validation stage, we stop right away.
         if (err || validationResult.errors.length > 0) {
             validationResult.installationStatus = Statuses.FAILED;
-            callback(err, validationResult);
+            deleteTempAndCallback(err, validationResult);
             return;
         }
 
@@ -251,7 +264,7 @@ function _cmdInstall(packagePath, destinationDirectory, options, callback, _doUp
                 installDirectory = path.join(options.disabledDirectory, extensionName);
                 validationResult.installationStatus = Statuses.DISABLED;
                 validationResult.disabledReason = Errors.API_NOT_COMPATIBLE;
-                _removeAndInstall(packagePath, installDirectory, validationResult, callback);
+                _removeAndInstall(packagePath, installDirectory, validationResult, deleteTempAndCallback);
                 return;
             }
         }
@@ -271,25 +284,25 @@ function _cmdInstall(packagePath, destinationDirectory, options, callback, _doUp
                     // both legacy and new extensions installed.
                     fs.remove(legacyDirectory, function (err) {
                         if (err) {
-                            callback(err);
+                            deleteTempAndCallback(err, validationResult);
                             return;
                         }
-                        _removeAndInstall(packagePath, installDirectory, validationResult, callback);
+                        _removeAndInstall(packagePath, installDirectory, validationResult, deleteTempAndCallback);
                     });
                 } else {
-                    _removeAndInstall(packagePath, installDirectory, validationResult, callback);
+                    _removeAndInstall(packagePath, installDirectory, validationResult, deleteTempAndCallback);
                 }
             } else if (hasLegacyPackage) {
                 validationResult.installationStatus = Statuses.NEEDS_UPDATE;
                 validationResult.name = guessedName;
-                callback(null, validationResult);
+                deleteTempAndCallback(null, validationResult);
             } else {
-                _checkExistingInstallation(validationResult, installDirectory, systemInstallDirectory, callback);
+                _checkExistingInstallation(validationResult, installDirectory, systemInstallDirectory, deleteTempAndCallback);
             }
         } else {
             // Regular installation with no conflicts.
             validationResult.disabledReason = null;
-            _performInstall(packagePath, installDirectory, validationResult, callback);
+            _performInstall(packagePath, installDirectory, validationResult, deleteTempAndCallback);
         }
     };
 
@@ -329,26 +342,6 @@ function _cmdUpdate(packagePath, destinationDirectory, options, callback) {
     _cmdInstall(packagePath, destinationDirectory, options, callback, true);
 }
 
-/**
- * Creates a uniquely-named file in the OS temp directory and opens it for writing.
- * @return {{localPath: string, outStream: WriteStream}}
- */
-function _createTempFile() {
-    var root = os.tmpDir();
-    var pathPrefix = root + "/brackets.download";
-    var suffix = 1;
-    while (fs.existsSync(pathPrefix + suffix) && suffix < 100) {
-        suffix++;
-    }
-    if (suffix === 100) {
-        return null;
-    }
-
-    var localPath = pathPrefix + suffix;
-    var outStream = fs.createWriteStream(localPath);
-    return { outStream: outStream, localPath: localPath };
-}
-
 /**
  * Wrap up after the given download has terminated (successfully or not). Closes connections, calls back the
  * client's callback, and IF there was an error, delete any partially-downloaded file.
@@ -409,15 +402,15 @@ function _cmdDownloadFile(downloadId, url, callback) {
                 return;
             }
 
-            var tempFileInfo = _createTempFile();
-            if (!tempFileInfo) {
+            var stream = temp.createWriteStream("brackets");
+            if (!stream) {
                 _endDownload(downloadId, Errors.CANNOT_WRITE_TEMP);
                 return;
             }
-            pendingDownloads[downloadId].localPath = tempFileInfo.localPath;
-            pendingDownloads[downloadId].outStream = tempFileInfo.outStream;
+            pendingDownloads[downloadId].localPath = stream.path;
+            pendingDownloads[downloadId].outStream = stream;
 
-            tempFileInfo.outStream.write(body);
+            stream.write(body);
             _endDownload(downloadId);
         });