From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Sat, 26 May 2007 14:29:24 +0000 (+0000)
Subject: Installer was defaulting the dir to c:\program files\inspircd and wouldnt present... 
X-Git-Tag: v2.0.23~5268
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=3ad40b22a70a3086771f4d195755a4d94c3bd9e3;p=user%2Fhenk%2Fcode%2Finspircd.git

Installer was defaulting the dir to c:\program files\inspircd and wouldnt present the user with an option to change. This is a BIG no-no and needed to be fixed before release.


git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@7149 e03df62e-2008-0410-955e-edbf42e46eb7
---

diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index 9fb79c0dd..dc32e778b 100644
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -32,15 +32,14 @@ SetCompressor bzip2
 ; License page
 !define MUI_LICENSEPAGE_CHECKBOX
 !insertmacro MUI_PAGE_LICENSE "..\docs\COPYING"
+; directory page
+Page directory
 ; Components page
 !insertmacro MUI_PAGE_COMPONENTS
-; Directory page
-!insertmacro MUI_PAGE_DIRECTORY
 ; Instfiles page
 !insertmacro MUI_PAGE_INSTFILES
 ; Finish page
 !define MUI_FINISHPAGE_RUN "$INSTDIR\InspGUI.exe"
-!define MUI_FINISHPAGE_RUN_PARAMETERS "--nofork"
 !insertmacro MUI_PAGE_FINISH
 
 ; Uninstaller pages
@@ -176,8 +175,8 @@ SectionEnd
 ; Section descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Actual Executable"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Default Config Files"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "Command Modules"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Default Config Files"
   !insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Optional Modules"
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
@@ -190,6 +189,7 @@ FunctionEnd
 Function .onInit
   SectionSetFlags ${SEC01} 17
   SectionSetFlags ${SEC03} 17
+  StrCpy $INSTDIR "$PROGRAMFILES\InspIRCd"
 FunctionEnd
 
 Function un.onInit
@@ -228,3 +228,5 @@ Section Uninstall
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
   SetAutoClose true
 SectionEnd
+
+Page directory