Added silent installers for 32/64 bit; updated install script to check arch

Added check for existing installs; install will be skipped if already installed

Fixes brave/brave-browser#1540

Author: bsclifton

app/windowsInit.js

@@ -57,16 +57,38 @@ function CopyManifestFile () {
 }
 
 const getBraveCoreInstallerPath = () => {
+  const os = require('os')
   const appDir = getBraveBinPath()
-  return path.join(appDir, 'resources', 'BraveBrowserSetup.exe')
+  return path.join(appDir, 'resources',
+    os.arch() === 'x32' ? 'BraveBrowserSetup32.exe' : 'BraveBrowserSetup64.exe')
 }
 
 function InstallBraveCore () {
-  // TODO(bsclifton): get a proper version of the omaha installer
-  // (built using https://github.com/brave/devops/pull/335)
-  //const cmd = getBraveCoreInstallerPath() + " /silent /install"
-  const cmd = getBraveCoreInstallerPath() + " /install"
+  const fs = require('fs')
+
+  // expected install paths
+  const braveCoreInstallLocations = [
+    '%USERPROFILE%\\AppData\\Local\\BraveSoftware\\Brave-Browser\\Application',
+    '%ProgramFiles(x86)%\\BraveSoftware\\Brave-Browser\\Application',
+    '%ProgramFiles%\\BraveSoftware\\Brave-Browser\\Application'
+  ]
+
+  // check for existing installations
+  for (let i=0; i < braveCoreInstallLocations.length; i++) {
+    const path = braveCoreInstallLocations[i]
+    const resolvedPath = path.replace(/%([^%]+)%/g, function(_, variableToResolve) {
+      return process.env[variableToResolve]
+    })
+    if (fs.existsSync(resolvedPath)) {
+      return false
+    }
+  }
+
+  // brave-core is not installed; go ahead with silent install
+  const cmd = getBraveCoreInstallerPath() + " /silent /install"
   execSync(cmd)
+
+  return true
 }
 
 // windows installation events etc...
@@ -94,22 +116,21 @@ if (process.platform === 'win32') {
     CopyManifestFile()
     // Launch defaults helper to add defaults on install
     spawn(getBraveDefaultsBinPath(), [], { detached: true })
-    // Silent install brave-core
-    // TODO(bsclifton):
-    // - don't install if already installed
-    // - verify this doesn't run twice AND that it doesn't run on uninstall
-    InstallBraveCore()
-    // relaunch and append argument expected in:
-    // https://github.com/brave/brave-browser/issues/1545
-    app.relaunch({args: ['--relaunch', '--upgrade-from-muon']})
-    app.exit()
-    return
-
   } else if (isSquirrelUninstall) {
     // Launch defaults helper to remove defaults on uninstall
     // Sync to avoid file path in use on uninstall
     spawnSync(getBraveDefaultsBinPath(), ['-uninstall'])
   }
+  // silent install brave-core
+  if (isSquirrelFirstRun || isSquirrelInstall || isSquirrelUpdate) {
+    if (InstallBraveCore()) {
+      // relaunch and append argument expected in:
+      // https://github.com/brave/brave-browser/issues/1545
+      app.relaunch({args: ['--relaunch', '--upgrade-from-muon']})
+      app.exit()
+      return
+    }
+  }
 
   if (shouldQuit(channel)) {
     process.exit(0)

res/BraveBrowserSetup.exe renamed to res/BraveBrowserSetup32.exe

@@ -152,7 +152,8 @@ if (isLinux) {
   cmds.push('move .\\temp.VisualElementsManifest.xml "' + path.join(buildDir, 'resources', 'Update.VisualElementsManifest.xml') + '"')
   cmds.push('copy .\\res\\start-tile-70.png "' + path.join(buildDir, 'resources', 'start-tile-70.png') + '"')
   cmds.push('copy .\\res\\start-tile-150.png "' + path.join(buildDir, 'resources', 'start-tile-150.png') + '"')
-  cmds.push('copy .\\res\\BraveBrowserSetup.exe "' + path.join(buildDir, 'resources', 'BraveBrowserSetup.exe') + '"')
+  cmds.push('copy .\\res\\BraveBrowserSetup32.exe "' + path.join(buildDir, 'resources', 'BraveBrowserSetup32.exe') + '"')
+  cmds.push('copy .\\res\\BraveBrowserSetup64.exe "' + path.join(buildDir, 'resources', 'BraveBrowserSetup64.exe') + '"')
   cmds.push('makensis.exe -DARCH=' + arch + ` res/${channel}/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.