diff --git a/menus/linux.cson b/menus/linux.cson index f69ab563c..cf4cdfb2e 100644 --- a/menus/linux.cson +++ b/menus/linux.cson @@ -147,7 +147,6 @@ { label: '&About Atom...', command: 'application:about' } { label: 'View &License', command: 'application:open-license' } { label: "VERSION", enabled: false } - { label: "Install &update", command: 'application:install-update', visible: false } { type: 'separator' } { label: '&Documentation', command: 'application:open-documentation' } { type: 'separator' } diff --git a/package.json b/package.json index a48afe190..66f671b0a 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "url": "https://github.com/atom/atom/issues" }, "license": "All Rights Reserved", - "atomShellVersion": "0.11.4", + "atomShellVersion": "0.11.5", "dependencies": { "async": "0.2.6", "atom-keymap": "^0.15.0", diff --git a/script/mkdeb b/script/mkdeb index 66ce9686b..0bcc84926 100755 --- a/script/mkdeb +++ b/script/mkdeb @@ -12,7 +12,7 @@ ICON_FILE="$4" DEB_PATH="$5" TARGET_ROOT="`mktemp -d`" -TARGET="$TARGET_ROOT/atom-$VERSION" +TARGET="$TARGET_ROOT/atom-$VERSION-amd64" mkdir -p "$TARGET/usr" env INSTALL_PREFIX="$TARGET/usr" script/grunt install @@ -27,5 +27,5 @@ mkdir -p "$TARGET/usr/share/pixmaps" cp "$ICON_FILE" "$TARGET/usr/share/pixmaps" dpkg-deb -b "$TARGET" -mv "$TARGET_ROOT/atom-$VERSION.deb" "$DEB_PATH" +mv "$TARGET_ROOT/atom-$VERSION-amd64.deb" "$DEB_PATH" rm -rf $TARGET_ROOT diff --git a/src/menu-manager.coffee b/src/menu-manager.coffee index 8565cacaf..6e3f03c67 100644 --- a/src/menu-manager.coffee +++ b/src/menu-manager.coffee @@ -116,10 +116,10 @@ class MenuManager normalizeLabel: (label) -> return undefined unless label? - if process.platform is 'win32' - label.replace(/\&/g, '') - else + if process.platform is 'darwin' label + else + label.replace(/\&/g, '') # Get an {Array} of {String} classes for the given element. classesForElement: (element) ->