Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(nsis): fix per-machine installs #6450

Merged
merged 4 commits into from
Nov 30, 2021
Merged

fix(nsis): fix per-machine installs #6450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
249d32e
fix(nsis): fix per-machine installs
rpatrick00 Nov 28, 2021
b097486
fix(nsis): fix per-machine installs
robertpatrick Nov 29, 2021
b8521a0
remove IntelliJ 2021.3 file
robertpatrick Nov 29, 2021
862fe85
Create famous-games-hide.md
mmaietta Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/famous-games-hide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"app-builder-lib": patch
"electron-updater": patch
---

fix(nsis): fix per-machine installs to properly elevate during silent install/updates
26 changes: 26 additions & 0 deletions packages/app-builder-lib/templates/nsis/installer.nsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,32 @@ FunctionEnd

Section "install"
!ifndef BUILD_UNINSTALLER
# If we're running a silent upgrade of a per-machine installation, elevate so extracting the new app will succeed.
# For a non-silent install, the elevation will be triggered when the install mode is selected in the UI,
# but that won't be executed when silent.
!ifndef INSTALL_MODE_PER_ALL_USERS
!ifndef ONE_CLICK
${if} $hasPerMachineInstallation == "1" # set in onInit by initMultiUser
${andIf} ${Silent}
${ifNot} ${UAC_IsAdmin}
ShowWindow $HWNDPARENT ${SW_HIDE}
!insertmacro UAC_RunElevated
${Switch} $0
${Case} 0
${Break}
${Case} 1223 ;user aborted
${Break}
${Default}
MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Unable to elevate, error $0"
${Break}
${EndSwitch}
Quit
${else}
!insertmacro setInstallModePerAllUsers
${endIf}
${endIf}
!endif
!endif
!include "installSection.nsh"
!endif
SectionEnd
Expand Down
18 changes: 2 additions & 16 deletions packages/electron-updater/src/BaseUpdater.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import * as fs from "fs"
import * as path from "path"
import { AllPublishOptions } from "builder-util-runtime"
import { AppAdapter } from "./AppAdapter"
import { AppUpdater, DownloadExecutorTask } from "./AppUpdater"
Expand Down Expand Up @@ -59,24 +57,12 @@ export abstract class BaseUpdater extends AppUpdater {
this.quitAndInstallCalled = true

try {
let installPathRequiresElevation = false
if (process.platform === "win32") {
try {
const accessTestPath = path.join(path.dirname(process.execPath), `access-${Math.floor(Math.random() * 100)}.tmp`)
fs.writeFileSync(accessTestPath, " ")
fs.rmSync(accessTestPath)
} catch (err) {
// Require admin rights if needed
installPathRequiresElevation = true
}
}

this._logger.info(`Install: isSilent: ${isSilent}, isForceRunAfter: ${isForceRunAfter}, installPathRequiresElevation: ${installPathRequiresElevation}`)
this._logger.info(`Install: isSilent: ${isSilent}, isForceRunAfter: ${isForceRunAfter}`)
return this.doInstall({
installerPath,
isSilent,
isForceRunAfter,
isAdminRightsRequired: installPathRequiresElevation || downloadedFileInfo.isAdminRightsRequired,
isAdminRightsRequired: downloadedFileInfo.isAdminRightsRequired,
})
} catch (e) {
this.dispatchError(e)
Expand Down