[Gpg4win-commits] [git] Gpg4win - branch, master, updated. gpg4win-3.1.5-6-gc894300

[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 "GnuPG for Windows".

The branch, master has been updated
       via  c894300c154e9fa550c1efce9ded2580b6a94827 (commit)
      from  8223b4025b25541c52ad93621604b446d710e045 (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 c894300c154e9fa550c1efce9ded2580b6a94827
Author: Andre Heinecke <aheinecke at gnupg.org>
Date:   Wed Jan 9 11:02:40 2019 +0100

    Add ini and cmd line switch for browser
    
    * doc/manual/einsteiger.tex: Slightly update ini example.
    * src/gpg4win.nsi: Register new variable
    * src/installer.nsi: Read new variable.
    * src/inst-sections.nsi: Handle it.
    
    --
    The browser integration can now be toggled by adding
    inst_browser = true to a gpg4win.ini or by adding
    /WITH_BROWSER=1 to the command line when calling the installer.
    
    GnuPG-Bug-Id: T4297

diff --git a/doc/manual/einsteiger.tex b/doc/manual/einsteiger.tex
index b485aff..bc7248b 100644
--- a/doc/manual/einsteiger.tex
+++ b/doc/manual/einsteiger.tex
@@ -1627,13 +1627,11 @@ zugleich alle erlaubten Schl
 \begin{verbatim}
 [gpg4win]
   ; Installer Einstellungen. Weg- oder leerlassen für Voreinstellung
-  inst_gnupg2 = true
   inst_gpgol = true
   inst_gpgex = true
   inst_gpa = true
-  inst_winpt = true
-  inst_gpgee = true
-  inst_claws_mail = false
+  inst_kleopatra = true
+  inst_browser = false
   inst_man_novice_de = true
   inst_man_novice_en = true
   inst_man_advanced_de = true
@@ -1644,18 +1642,6 @@ zugleich alle erlaubten Schl
   inst_desktop = false
   inst_quick_launch_bar = false
 
-  ; Im Gegensatz zu den anderen Optionen überschreibt diese Option
-  ; die Einstellung des Benutzers im Installer.
-  inst_start_menu_folder = GnuPG for Windows
-
-  ; Standard-Konfigurationsdateien.
-  gpg.conf = D:\config\gpg-site.conf
-  gpg-agent.conf = D:\config\gpg-agent-site.conf
-  trustlist.txt = D:\config\trustlist-site.txt
-  dirmngr.conf = D:\config\dirmngr-site.conf
-  dirmngr_ldapserver.conf = D:\config\dirmngr_ldapserver-site.conf
-  scdaemon.conf = D:\config\scdaemon-site.txt
-  gpa.conf = D:\config\gpa-site.conf
 \end{verbatim}
 
 Ein entsprechender Aufruf zur automatischen Installation mit einer
diff --git a/src/gpg4win.nsi b/src/gpg4win.nsi
index 526db45..7f2b4c1 100644
--- a/src/gpg4win.nsi
+++ b/src/gpg4win.nsi
@@ -173,6 +173,7 @@ SetCompressor /SOLID lzma
 
 # Variables
 VAR is_minimal
+VAR with_browser
 VAR is_update
 
 # Sections
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index 257ee1d..46cb5c7 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -546,9 +546,23 @@ select_minimal:
    !insertmacro SelectSection ${SEC_gnupg_w32}
    !insertmacro SelectSection ${SEC_pinentry}
 continue:
+
+# Check if browser integration was selected on the command line
+# or in the ini
+# You can either select the browser integration by adding
+# inst_browser = true to a gpg4win.ini or adding a
+# /WITH_BROWSER=1 command line switch to the installer.
+g4wihelp::config_fetch_bool "inst_browser"
+StrCmp $R0 "1" select_browser 0
+StrCmp $with_browser '1' select_browser skip_browser
+select_browser:
+    !insertmacro SelectSection ${SEC_gpgme_browser}
+skip_browser:
+
 FunctionEnd
 
 
+
 Function CalcDepends
   # This section could very well be autogenerated from the
   # information in configure.ac.  Note that it doesn't hurt to have
diff --git a/src/installer.nsi b/src/installer.nsi
index 4abd691..6f8533a 100644
--- a/src/installer.nsi
+++ b/src/installer.nsi
@@ -707,6 +707,7 @@ Function .onInit
   ${GetParameters} $R0
   ClearErrors
   ${GetOptions} $R0 /MINIMAL= $is_minimal
+  ${GetOptions} $R0 /WITH_BROWSER= $with_browser
 
   Var /GLOBAL changed_dir
   # Check if the install directory was modified on the command line

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

Summary of changes:
 doc/manual/einsteiger.tex | 18 ++----------------
 src/gpg4win.nsi           |  1 +
 src/inst-sections.nsi     | 14 ++++++++++++++
 src/installer.nsi         |  1 +
 4 files changed, 18 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org