[git] GnuPG - branch, master, updated. gnupg-2.1.20-106-gd378cc3

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  d378cc34a8d3d5053cf0c5ac7aa731c1bcefee22 (commit)
      from  8a168a6d4052ec31fed77c79bb96ffdd32bf9646 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d378cc34a8d3d5053cf0c5ac7aa731c1bcefee22
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed May 3 16:28:24 2017 +0200

    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 <aheinecke at intevation.de>

diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 297ef06..b89876e 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:

-----------------------------------------------------------------------

Summary of changes:
 build-aux/speedo/w32/inst.nsi | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org