Dunno why this method was static, doesnt need to be...

[user/henk/code/inspircd.git] / win / inspircd.nsi

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