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 40c15053de0faab13532923743aec05acaaad04d..dc32e778ba310e176cd4b6968236a7b1d59eb765 100644 (file)
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -24,23 +24,22 @@ SetCompressor bzip2
 \r
 ; MUI Settings\r
 !define MUI_ABORTWARNING\r
-!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\arrow2-install.ico"\r
-!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\arrow2-uninstall.ico"\r
+!define MUI_ICON "inspircd.ico"\r
+!define MUI_UNICON "inspircd.ico"\r
 \r
 ; Welcome page\r
 !insertmacro MUI_PAGE_WELCOME\r
 ; 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
@@ -170,13 +169,14 @@ Section -Post
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"\r
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"\r
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"\r
+  MessageBox MB_ICONINFORMATION|MB_OK "InspIRCd was successfully installed. Remember to edit your configuration file in $INSTDIR\conf!"\r
 SectionEnd\r
 \r
 ; 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
@@ -186,6 +186,12 @@ Function un.onUninstSuccess
   MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer."\r
 FunctionEnd\r
 \r
+Function .onInit\r
+  SectionSetFlags ${SEC01} 17\r
+  SectionSetFlags ${SEC03} 17\r
+  StrCpy $INSTDIR "$PROGRAMFILES\InspIRCd"\r
+FunctionEnd\r
+\r
 Function un.onInit\r
   MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2\r
   Abort\r
@@ -222,3 +228,5 @@ Section Uninstall
   DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"\r
   SetAutoClose true\r
 SectionEnd\r
+\r
+Page directory\r