summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-04-30 10:46:30 +0200
committerYohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>2011-04-30 10:46:30 +0200
commit0c253ea5f27478d8e151d125fa787fe782b9b954 (patch)
tree2855b096675e0d6ce1d8d867605ab158d7ebdcab
parent9307acf9d24833621d9e8ffa811b4faf645992cc (diff)
downloadbranding-0c253ea5f27478d8e151d125fa787fe782b9b954.tar.gz
branding-0c253ea5f27478d8e151d125fa787fe782b9b954.tar.bz2
branding-0c253ea5f27478d8e151d125fa787fe782b9b954.tar.xz
branding-0c253ea5f27478d8e151d125fa787fe782b9b954.zip
Made use of the product short name in the windows registry.
This permits to avoid flawed installation paths when installing both the mana client and The Mana world for instance. Pointed out by Thorbjorn at the time. In fact, I forgot to commit that earlier.
-rw-r--r--packaging/windows/setup-tmw.nsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/windows/setup-tmw.nsi b/packaging/windows/setup-tmw.nsi
index 5b5319f..e26d087 100644
--- a/packaging/windows/setup-tmw.nsi
+++ b/packaging/windows/setup-tmw.nsi
@@ -65,7 +65,7 @@ SetCompressor /SOLID lzma
!define PRODUCT_VERSION "0.5.0"
!endif
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\mana.exe"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME_SHORT}.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -352,7 +352,7 @@ SectionEnd
Section -Post
WriteUninstaller "$INSTDIR\uninst.exe"
- WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\mana.exe"
+ WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
!ifdef BRANDINGDIR