tauri-apps/tauri
1
1
Fork 0
mirror of https://github.com/tauri-apps/tauri.git synced 2024-08-16 11:20:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix(nsis): run app as normal user (#9944)

Browse Source
This commit is contained in:
Tony 2024-06-06 08:53:11 +08:00 committed by GitHub
parent 30bc3d2095
commit 6f469534b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.changes/nsis-run-as-user.md Normal file
View File

@ -0,0 +1,5 @@
---
"tauri-bundler": patch:bug
---
Fix NSIS installer runs the app as admin when using `perMachine` install mode

4
tooling/bundler/src/bundle/windows/nsis.rs
View File

@ -34,8 +34,8 @@ const NSIS_URL: &str =
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
const NSIS_SHA1: &str = "057e83c7d82462ec394af76c87d06733605543d4"; const NSIS_SHA1: &str = "057e83c7d82462ec394af76c87d06733605543d4";
const NSIS_TAURI_UTILS_URL: &str = const NSIS_TAURI_UTILS_URL: &str =
"https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.3.0/nsis_tauri_utils.dll"; "https://github.com/tauri-apps/nsis-tauri-utils/releases/download/nsis_tauri_utils-v0.4.0/nsis_tauri_utils.dll";
const NSIS_TAURI_UTILS_SHA1: &str = "01E48D6429B48B640230C6CE8F257C84758943AA"; const NSIS_TAURI_UTILS_SHA1: &str = "E0FC0951DEB0E5E741DF10328F95C7D6678AD3AA";
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
const NSIS_REQUIRED_FILES: &[&str] = &[ const NSIS_REQUIRED_FILES: &[&str] = &[

9
tooling/bundler/src/bundle/windows/templates/installer.nsi
View File

@ -348,10 +348,15 @@ Var AppStartMenuFolder
!define MUI_FINISHPAGE_SHOWREADME_TEXT "$(createDesktop)" !define MUI_FINISHPAGE_SHOWREADME_TEXT "$(createDesktop)"
!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateOrUpdateDesktopShortcut !define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateOrUpdateDesktopShortcut
; Show run app after installation. ; Show run app after installation.
!define MUI_FINISHPAGE_RUN "$INSTDIR\${MAINBINARYNAME}.exe" !define MUI_FINISHPAGE_RUN
!define MUI_FINISHPAGE_RUN_FUNCTION RunMainBinary
!define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfPassive !define MUI_PAGE_CUSTOMFUNCTION_PRE SkipIfPassive
!insertmacro MUI_PAGE_FINISH !insertmacro MUI_PAGE_FINISH
Function RunMainBinary
nsis_tauri_utils::RunAsUser "$INSTDIR\${MAINBINARYNAME}.exe" ""
FunctionEnd
; Uninstaller Pages ; Uninstaller Pages
; 1. Confirm uninstall page ; 1. Confirm uninstall page
Var DeleteAppDataCheckbox Var DeleteAppDataCheckbox
@ -617,7 +622,7 @@ Function .onInstSuccess
${GetOptions} $CMDLINE "/R" $R0 ${GetOptions} $CMDLINE "/R" $R0
${IfNot} ${Errors} ${IfNot} ${Errors}
${GetOptions} $CMDLINE "/ARGS" $R0 ${GetOptions} $CMDLINE "/ARGS" $R0
Exec '"$INSTDIR\${MAINBINARYNAME}.exe" $R0' nsis_tauri_utils::RunAsUser "$INSTDIR\${MAINBINARYNAME}.exe" "$R0"
${EndIf} ${EndIf}
${EndIf} ${EndIf}
FunctionEnd FunctionEnd