[PATCH 1 of 2] Fix some paths where \BSI subdirectory was forgotten

Wald Commits scm-commit at wald.intevation.org
Thu Oct 30 12:33:32 CET 2014


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1414668786 -3600
# Node ID 00ba9a4c422d4f8987b35a5d59f62b29939cf227
# Parent  7840851b26b9cfa9d117b3aef8b47c1556dc4311
Fix some paths where \BSI subdirectory was forgotten.

    This fixes single user installation again.

diff -r 7840851b26b9 -r 00ba9a4c422d packaging/trustbridge.nsi
--- a/packaging/trustbridge.nsi	Thu Oct 30 11:19:28 2014 +0100
+++ b/packaging/trustbridge.nsi	Thu Oct 30 12:33:06 2014 +0100
@@ -25,11 +25,11 @@
 !define MULTIUSER_EXECUTIONLEVEL Highest
 !define MULTIUSER_MUI
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
-!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\${productname_short}"
+!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\BSI\${productname_short}"
 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME ""
-!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\${productname_short}"
+!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\BSI\${productname_short}"
 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""
-!define MULTIUSER_INSTALLMODE_INSTDIR "${productname_short}"
+!define MULTIUSER_INSTALLMODE_INSTDIR "BSI\${productname_short}"
 
 !addplugindir "${plugin_dir}"
 !addincludedir "${plugin_dir}"
@@ -179,7 +179,7 @@
   ${GetOptions} $R0 /UPDATE= $is_update
 
 ; Check if the install directory was modified on the command line
-  StrCmp "$INSTDIR" "$PROGRAMFILES\${productname_short}" unmodified 0
+  StrCmp "$INSTDIR" "$PROGRAMFILES\BSI\${productname_short}" unmodified 0
   ; It is modified. Save that value.
   StrCpy $changed_dir "$INSTDIR"
 


More information about the Trustbridge-commits mailing list