From 3baf14a62c7a9f55f6030b8a17fb12d57282e8f9 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Fri, 12 Dec 2003 09:01:47 +0000
Subject: [PATCH] NSIS doesn't like uninst being in Program

---
 stepmania/stepmania.nsi | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/stepmania/stepmania.nsi b/stepmania/stepmania.nsi
index abd44e7219..85f958fdea 100644
--- a/stepmania/stepmania.nsi
+++ b/stepmania/stepmania.nsi
@@ -55,14 +55,6 @@ do_uninstall_nsis:
 Exec "$INSTDIR\uninst.exe"
 old_nsis_not_installed:
 
-IfFileExists "$INSTDIR\Program\uninst.exe" prompt_uninstall_nsis2 old_nsis_not_installed2
-prompt_uninstall_nsis2:
-MessageBox MB_YESNO|MB_ICONINFORMATION "The previous version of StepMania must be uninstalled before continuing.$\nDo you wish to continue?" IDYES do_uninstall_nsis2
-Abort
-do_uninstall_nsis2:
-Exec "$INSTDIR\Program\uninst.exe"
-old_nsis_not_installed2:
-
 ; Check for DirectX 8.0 (to be moved to the right section later)
 ; We only use this for sound.  Actually, I could probably make the sound
 ; work with an earlier one; I'm not sure if that's needed or not.  For one
@@ -98,12 +90,12 @@ Section ""
 ; write out uninstaller
 SetOutPath "$INSTDIR"
 SetOverwrite on
-WriteUninstaller "$INSTDIR\Program\uninst.exe"
+WriteUninstaller "$INSTDIR\uninst.exe"
 
 ; add registry entries
 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\StepMania\${PRODUCT_ID}" "" "$INSTDIR"
 WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "DisplayName" "${PRODUCT_ID} (remove only)"
-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "UninstallString" '"$INSTDIR\Program\uninst.exe"'
+WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}" "UninstallString" '"$INSTDIR\uninst.exe"'
 
 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\Applications\smpackage.exe\shell\open\command" "" '"$INSTDIR\Program\smpackage.exe" "%1"'
 WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Classes\smzipfile" "" "SMZIP package"
@@ -245,10 +237,10 @@ CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\Open StepMania Program Folder.lnk" "$W
 CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\View Statistics.lnk" "$INSTDIR\Data\MachineProfile\stats.html"
 CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\StepMania Tools and Package Exporter.lnk" "$INSTDIR\Program\smpackage.exe"
 CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\README-FIRST.lnk" "$INSTDIR\README-FIRST.html"
-CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\Uninstall ${PRODUCT_NAME_VER}.lnk" "$INSTDIR\Program\uninst.exe"
+CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\Uninstall ${PRODUCT_NAME_VER}.lnk" "$INSTDIR\uninst.exe"
 CreateShortCut "$SMPROGRAMS\${PRODUCT_ID}\Go To StepMania web site.lnk" "http://www.stepmania.com"
 
-CreateShortCut "$INSTDIR\stepmania.lnk" "$INSTDIR\Program\stepmania.exe"
+CreateShortCut "$INSTDIR\StepMania.lnk" "$INSTDIR\Program\stepmania.exe"
 
 # We want to delete a few old desktop icons, since they weren't being
 # uninstalled correctly during alpha 2 and 3.  They were installed in
@@ -274,7 +266,7 @@ UninstallText "This will uninstall StepMania from your system.$\nAny add-on pack
 Section Uninstall
 
 ; add delete commands to delete whatever files/registry keys/etc you installed here.
-Delete "$INSTDIR\Program\uninst.exe"
+Delete "$INSTDIR\uninst.exe"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\StepMania\${PRODUCT_ID}"
 DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_ID}"
 
@@ -365,6 +357,7 @@ RMDir "$INSTDIR\Program"
 Delete "$INSTDIR\log.txt"
 Delete "$INSTDIR\info.txt"
 Delete "$INSTDIR\crashinfo.txt"
+Delete "$INSTDIR\StepMania.lnk"
 
 RMDir "$INSTDIR"	; will delete only if empty