diff options
| author | Andre Heinecke <[email protected]> | 2017-05-03 14:28:24 +0000 |
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2017-05-03 14:29:45 +0000 |
| commit | d378cc34a8d3d5053cf0c5ac7aa731c1bcefee22 (patch) | |
| tree | 4557cb2973e28fb15f317318374f87b57cc6f5f3 /build-aux/speedo | |
| parent | gpgscm: Create and re-use frame objects. (diff) | |
| download | gnupg-d378cc34a8d3d5053cf0c5ac7aa731c1bcefee22.tar.gz gnupg-d378cc34a8d3d5053cf0c5ac7aa731c1bcefee22.zip | |
speedo,w32: Fix silent user mode installation
* build-aux/speedo/w32/inst.nsi (AddToPath): Move account
check here.
(PrintNonAdminWarning): Remove is_user_install variable.
--
The PrintNonAdminWarning is not called in silent mode so the
variable was never set.
Signed-off-by: Andre Heinecke <[email protected]>
Diffstat (limited to 'build-aux/speedo')
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index 297ef06ae..b89876e44 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -360,8 +360,6 @@ FunctionEnd # OS version without the need for an Administrator is in use. Print a # diagnostic if this is not the case and abort installation. Function PrintNonAdminWarning - Var /GLOBAL is_user_install - StrCpy $is_user_install "0" ClearErrors UserInfo::GetName IfErrors leave @@ -370,7 +368,6 @@ Function PrintNonAdminWarning Pop $1 StrCmp $1 "Admin" leave +1 MessageBox MB_YESNO "$(T_AdminWanted)" IDNO exit - StrCpy $is_user_install "1" goto leave exit: Quit @@ -520,8 +517,24 @@ FunctionEnd # AddToPath - Adds the given dir to the search path. # Input - head of the stack Function AddToPath + ClearErrors + UserInfo::GetName + IfErrors add_admin + Pop $0 + UserInfo::GetAccountType + Pop $1 + StrCmp $1 "Admin" add_admin add_user + +add_admin: Exch $0 - g4wihelp::path_add "$0" $is_user_install + g4wihelp::path_add "$0" "0" + goto add_done +add_user: + Exch $0 + g4wihelp::path_add "$0" "1" + goto add_done + +add_done: StrCmp $R5 "0" add_to_path_done SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 add_to_path_done: |