# HG changeset patch # User Andre Heinecke # Date 1414491392 -3600 # Node ID 0971c7214e79c5c602bfc057d4d55ebe15ce9f9e # Parent dab626e44347a950a68b8fc530fd67577edd567a (issue160) Change install prefix to include BSI directory diff -r dab626e44347 -r 0971c7214e79 packaging/linux-installer-common.inc.in --- a/packaging/linux-installer-common.inc.in Tue Oct 28 11:11:27 2014 +0100 +++ b/packaging/linux-installer-common.inc.in Tue Oct 28 11:16:32 2014 +0100 @@ -1,6 +1,6 @@ #-*-sh-*- ME=`basename "$0"` -DEFAULT_PREFIX="$HOME/TrustBridge" +DEFAULT_PREFIX="$HOME/BSI/TrustBridge" SYSDEFAULT_PREFIX="/usr/local" CFGPATH="${XDG_CONFIG_HOME:-$HOME/.config}/BSI" DATAPATH="${XDG_DATA_HOME:-$HOME/.local/share}/BSI/TrustBridge" diff -r dab626e44347 -r 0971c7214e79 packaging/trustbridge.nsi --- a/packaging/trustbridge.nsi Tue Oct 28 11:11:27 2014 +0100 +++ b/packaging/trustbridge.nsi Tue Oct 28 11:16:32 2014 +0100 @@ -59,7 +59,7 @@ ; Define Name, File and Installdir of Installer Name "${productname}" OutFile "${setupname}" -InstallDir "$PROGRAMFILES\${productname_short}" +InstallDir "$PROGRAMFILES\BSI\${productname_short}" BrandingText "${company} - ${productname}" ;-------------------------------- @@ -89,7 +89,7 @@ !define MUI_FINISHPAGE_NOAUTOCLOSE !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX" -!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${productname_short}" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\BSI\${productname_short}" !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" @@ -227,7 +227,7 @@ ; Code below is not run on updates StrCmp $is_update '1' done - WriteRegStr SHCTX "Software\${productname_short}" "" $INSTDIR + WriteRegStr SHCTX "Software\BSI\${productname_short}" "" $INSTDIR ; Set up autostart WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "TrustBridge" "$INSTDIR\trustbridge.exe --tray" @@ -336,9 +336,9 @@ !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder - DeleteRegValue SHCTX "Software\${productname_short}" "Start Menu Folder" + DeleteRegValue SHCTX "Software\BSI\${productname_short}" "Start Menu Folder" - DeleteRegKey /ifempty SHCTX "Software\${productname_short}" + DeleteRegKey /ifempty SHCTX "Software\BSI\${productname_short}" ; Unregister autostart DeleteRegValue SHCTX "Software\Microsoft\Windows\CurrentVersion\Run" "TrustBridge"