Mercurial > trustbridge
comparison packaging/trustbridge.nsi @ 1350:00ba9a4c422d
Fix some paths where \BSI subdirectory was forgotten.
This fixes single user installation again.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 30 Oct 2014 12:33:06 +0100 |
| parents | 0971c7214e79 |
| children | 4503af8f6ce4 |
comparison
equal
deleted
inserted
replaced
| 1349:7840851b26b9 | 1350:00ba9a4c422d |
|---|---|
| 23 !endif | 23 !endif |
| 24 | 24 |
| 25 !define MULTIUSER_EXECUTIONLEVEL Highest | 25 !define MULTIUSER_EXECUTIONLEVEL Highest |
| 26 !define MULTIUSER_MUI | 26 !define MULTIUSER_MUI |
| 27 !define MULTIUSER_INSTALLMODE_COMMANDLINE | 27 !define MULTIUSER_INSTALLMODE_COMMANDLINE |
| 28 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\${productname_short}" | 28 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "Software\BSI\${productname_short}" |
| 29 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "" | 29 !define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "" |
| 30 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\${productname_short}" | 30 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "Software\BSI\${productname_short}" |
| 31 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "" | 31 !define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME "" |
| 32 !define MULTIUSER_INSTALLMODE_INSTDIR "${productname_short}" | 32 !define MULTIUSER_INSTALLMODE_INSTDIR "BSI\${productname_short}" |
| 33 | 33 |
| 34 !addplugindir "${plugin_dir}" | 34 !addplugindir "${plugin_dir}" |
| 35 !addincludedir "${plugin_dir}" | 35 !addincludedir "${plugin_dir}" |
| 36 | 36 |
| 37 !include "MultiUser.nsh" | 37 !include "MultiUser.nsh" |
| 177 ${GetParameters} $R0 | 177 ${GetParameters} $R0 |
| 178 ClearErrors | 178 ClearErrors |
| 179 ${GetOptions} $R0 /UPDATE= $is_update | 179 ${GetOptions} $R0 /UPDATE= $is_update |
| 180 | 180 |
| 181 ; Check if the install directory was modified on the command line | 181 ; Check if the install directory was modified on the command line |
| 182 StrCmp "$INSTDIR" "$PROGRAMFILES\${productname_short}" unmodified 0 | 182 StrCmp "$INSTDIR" "$PROGRAMFILES\BSI\${productname_short}" unmodified 0 |
| 183 ; It is modified. Save that value. | 183 ; It is modified. Save that value. |
| 184 StrCpy $changed_dir "$INSTDIR" | 184 StrCpy $changed_dir "$INSTDIR" |
| 185 | 185 |
| 186 ; MULITUSER_INIT overwrites directory setting from command line | 186 ; MULITUSER_INIT overwrites directory setting from command line |
| 187 !insertmacro MULTIUSER_INIT | 187 !insertmacro MULTIUSER_INIT |