security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-21 15:01:41 +02:00
Code Activity

speedo,w32: Fix silent user mode installation

Browse Source 
* 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 <aheinecke@intevation.de>
This commit is contained in:
Andre Heinecke 2017-05-03 16:28:24 +02:00
parent 8a168a6d40
commit d378cc34a8
No known key found for this signature in database
GPG Key ID: 2978E9D40CBABA5C
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build-aux/speedo/w32/inst.nsi
View File

@ -360,8 +360,6 @@ FunctionEnd
# OS version without the need for an Administrator is in use. Print a # OS version without the need for an Administrator is in use. Print a
# diagnostic if this is not the case and abort installation. # diagnostic if this is not the case and abort installation.
Function PrintNonAdminWarning Function PrintNonAdminWarning
Var /GLOBAL is_user_install
StrCpy $is_user_install "0"
ClearErrors ClearErrors
UserInfo::GetName UserInfo::GetName
IfErrors leave IfErrors leave
@ -370,7 +368,6 @@ Function PrintNonAdminWarning
Pop $1 Pop $1
StrCmp $1 "Admin" leave +1 StrCmp $1 "Admin" leave +1
MessageBox MB_YESNO "$(T_AdminWanted)" IDNO exit MessageBox MB_YESNO "$(T_AdminWanted)" IDNO exit
StrCpy $is_user_install "1"
goto leave goto leave
exit: exit:
Quit Quit
@ -520,8 +517,24 @@ FunctionEnd
# AddToPath - Adds the given dir to the search path. # AddToPath - Adds the given dir to the search path.
# Input - head of the stack # Input - head of the stack
Function AddToPath 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 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 StrCmp $R5 "0" add_to_path_done
SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
add_to_path_done: add_to_path_done: