[Gpg4win-commits] r465 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2007-08-13 14:01:19 +0200 (Mon, 13 Aug 2007)
New Revision: 465

Modified:
   trunk/ChangeLog
   trunk/src/inst-dirmngr.nsi
   trunk/src/inst-gnupg2.nsi
   trunk/src/inst-gpa.nsi
Log:
2007-08-13  Marcus Brinkmann  <marcus at g10code.de>

	* src/inst-gnupg2.nsi: Install config files.
	* src/inst-dirmngr.nsi: Likewise.
	* src/inst-gpa.nsi: Likewise.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2007-08-13 04:11:27 UTC (rev 464)
+++ trunk/ChangeLog	2007-08-13 12:01:19 UTC (rev 465)
@@ -1,5 +1,9 @@
 2007-08-13  Marcus Brinkmann  <marcus at g10code.de>
 
+	* src/inst-gnupg2.nsi: Install config files.
+	* src/inst-dirmngr.nsi: Likewise.
+	* src/inst-gpa.nsi: Likewise.
+
 	* src/g4wihelp.c (config_init, config_fetch): New functions.
 	* src/inst-gnupg.nsi: Install gpg.conf AppData if configured.
 

Modified: trunk/src/inst-dirmngr.nsi
===================================================================
--- trunk/src/inst-dirmngr.nsi	2007-08-13 04:11:27 UTC (rev 464)
+++ trunk/src/inst-dirmngr.nsi	2007-08-13 12:01:19 UTC (rev 465)
@@ -65,5 +65,21 @@
   g4wihelp::service_start "DirMngr" "1" "\"$INSTDIR\dirmngr.exe\""
 dirmngr_restarted:
 
+
+  # If requested, install the configuration files.
+  ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
+  StrCmp $0 "" no_config_dirmngr_files
+  SetOutPath "$0\gnupg"
+
+  g4wihelp::config_fetch "dirmngr.conf"
+  StrCmp $R0 "" no_config_dirmngr_conf
+    CopyFiles $R0 "$0\gnupg\dirmngr.conf"
+  no_config_dirmngr_conf:
+
+  g4wihelp::config_fetch "dirmngr_ldapservers.conf"
+  StrCmp $R0 "" no_config_dirmngr_ldapservers_conf
+    CopyFiles $R0 "$0\gnupg\dirmngr_ldapservers.conf"
+  no_config_dirmngr_ldapservers_conf:
+
 !endif
 SectionEnd

Modified: trunk/src/inst-gnupg2.nsi
===================================================================
--- trunk/src/inst-gnupg2.nsi	2007-08-13 04:11:27 UTC (rev 464)
+++ trunk/src/inst-gnupg2.nsi	2007-08-13 12:01:19 UTC (rev 465)
@@ -64,6 +64,32 @@
 #  SetOutPath "$INSTDIR\gnupg2.nls"
 #  File "${prefix}/share/gnupg2/de.mo"
 
+  # If requested, install the configuration files.
+  ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
+  StrCmp $0 "" no_config_gpg_conf_files
+  SetOutPath "$0\gnupg"
+
+  g4wihelp::config_fetch "gpg.conf"
+  StrCmp $R0 "" no_config_gpg2_conf
+    CopyFiles $R0 "$0\gnupg\gpg.conf"
+  no_config_gpg2_conf:
+
+  g4wihelp::config_fetch "gpg-agent.conf"
+  StrCmp $R0 "" no_config_gpg_agent_conf
+    CopyFiles $R0 "$0\gnupg\gpg-agent.conf"
+  no_config_gpg_agent_conf:
+
+  g4wihelp::config_fetch "scdaemon.conf"
+  StrCmp $R0 "" no_config_scdaemon_conf
+    CopyFiles $R0 "$0\gnupg\scdaemon.conf"
+  no_config_scdaemon_conf:
+
+  g4wihelp::config_fetch "trustlist.txt"
+  StrCmp $R0 "" no_config_trustlist_txt
+    CopyFiles $R0 "$0\gnupg\trustlist.txt"
+  no_config_trustlist_txt:
+
+  no_config_gpg_conf_files:
 !endif
 SectionEnd
 

Modified: trunk/src/inst-gpa.nsi
===================================================================
--- trunk/src/inst-gpa.nsi	2007-08-13 04:11:27 UTC (rev 464)
+++ trunk/src/inst-gpa.nsi	2007-08-13 12:01:19 UTC (rev 465)
@@ -43,6 +43,16 @@
   File ${prefix}/share/gpa/gpa_logo.ppm
   File ${prefix}/share/gpa/gpa.png
 
+  # If requested, install the configuration files.
+  ReadRegStr $0 HKCU "Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" AppData
+  StrCmp $0 "" no_config_gpa_files
+  SetOutPath "$0\gnupg"
+
+  g4wihelp::config_fetch "gpa.conf"
+  StrCmp $R0 "" no_config_gpa_conf
+    CopyFiles $R0 "$0\gnupg\gpa.conf"
+  no_config_gpa_conf:
+
 !endif
 SectionEnd