Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Make Brave.exe squirrel aware
Browse files Browse the repository at this point in the history
Fix #6313

This fixes getting squirrel events so default registration happens and also makes it so Squirrel doesn't do its auto shortcut creation logic for every exe in the package
  • Loading branch information
bbondy committed Dec 29, 2016
1 parent c27eb0b commit e583f7b
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@
"css-loader": "^0.23.0",
"electron-builder": "^2.3.1",
"electron-packager": "brave/electron-packager",
"electron-winstaller": "^2.5.1",
"empty-port": "0.0.2",
"enzyme": "^2.6.0",
"flow-bin": "^0.22.1",
Expand All @@ -156,7 +157,6 @@
"mkdirp": "^0.5.1",
"mocha": "^2.3.4",
"mockery": "^1.7.0",
"muon-winstaller": "^2.4.0",
"ncp": "^2.0.0",
"node-gyp": "^3.2.1",
"node-libs-browser": "^1.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tools/buildInstaller.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ if (isDarwin) {
// need to store the output files in separate directories
outDir = path.join(outDir, arch)

var muonInstaller = require('muon-winstaller')
var muonInstaller = require('electron-winstaller')
var resultPromise = muonInstaller.createWindowsInstaller({
appDirectory: buildDir,
outputDirectory: outDir,
Expand Down
2 changes: 2 additions & 0 deletions tools/buildPackage.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ if (isLinux) {
cmds.push('copy .\\res\\start-tile-150.png "' + path.join(buildDir, 'resources', 'start-tile-150.png') + '"')
cmds.push('makensis.exe -DARCH=' + arch + ' res/braveDefaults.nsi')
cmds.push('ncp ./app/extensions ' + path.join(buildDir, 'resources', 'extensions'))
// Make sure the Brave.exe binary is squirrel aware so we get squirrel events and so that Squirrel doesn't auto create shortcuts.
cmds.push('"node_modules/rcedit/bin/rcedit.exe" ./Brave-win32-x64/Brave.exe --set-version-string "SquirrelAwareVersion" "1"')
}

cmds.push('mkdirp ' + path.join(buildDir, 'resources', 'app.asar.unpacked', 'node_modules', 'spellchecker', 'vendor', 'hunspell_dictionaries'))
Expand Down
2 changes: 1 addition & 1 deletion tools/lib/ignoredPaths.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = [
'electron-builder',
'electron-prebuilt',
'electron-rebuild',
'muon-winstaller',
'electron-winstaller',
'electron-winstaller-fixed',
'electron-installer-redhat',
'flow-bin',
Expand Down

4 comments on commit e583f7b

@bbondy
Copy link
Member Author

@bbondy bbondy commented on e583f7b Dec 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The resource file info block gets added somewhere in Chromium so it is correctly filled out by the way.

@bbondy
Copy link
Member Author

@bbondy bbondy commented on e583f7b Dec 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding it in the atom rc just complains with a resource compiler error that there is a duplicate file version info block defined. Which is probably why it was removed in the first place.

@bbondy
Copy link
Member Author

@bbondy bbondy commented on e583f7b Dec 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auditors: @bsclifton

@bsclifton
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++++ 😸

Please sign in to comment.