Write instdir reg key correctly. Don't add path.
authorAndre Heinecke <aheinecke@intevation.de>
Fri, 11 Dec 2015 17:10:50 +0000 (18:10 +0100)
committerAndre Heinecke <aheinecke@intevation.de>
Fri, 11 Dec 2015 17:10:50 +0000 (18:10 +0100)
* src/inst-gpg4win.nsi: Write the registry key correctly,
  don't add pub dir to path.

--
The pub dir will be removed in future versions. For now
it only contains GPA.

src/inst-gpg4win.nsi

index a7be820..d554a3b 100644 (file)
@@ -61,14 +61,10 @@ skip_uninst:
   FileClose $0
   DetailPrint "VERSION closed"
 
-  # Register the install directory for the GnuPG suite.
-  WriteRegStr HKLM "Software\GNU\GnuPG" "Install Directory" $INSTDIR
+  # Register the install directory for Gpg4win suite.
+  WriteRegStr HKLM "Software\${PRETTY_PACKAGE_SHORT}" "Install Directory" $INSTDIR
   DetailPrint "Saved install directory in the registry"
 
-  # Also write it to be recalled on new installation.  Currently
-  # disabled.
-  # WriteRegStr HKLM "Software\GNU\${PRETTY_PACKAGE_SHORT}" "Install Directory" $INSTDIR
-
   # We used to determine the language using a Registry entry.
   # Although we don't want to delete the user's Lang Registry Setting
   # because he might have have selected a different language than his
@@ -87,11 +83,6 @@ skip_uninst:
   DeleteRegValue HKLM "Software\GNU\GnuPG" "gpgProgram"
   DetailPrint "Deleted obsolete gpgProgram value"
 
-  # Add the public directory to the PATH
-  Push "$INSTDIR\pub"
-  Call AddToPath
-  DetailPrint "Added pub directory to PATH"
-
   # Install gpg4win included tools
   SetOutPath "$INSTDIR"
   File "${BUILD_DIR}/sha1sum.exe"