Switch some stuff to use ASCII mapping rather than RFC.

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

diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index cafbd38b9d304544bcdeb5c9c9b6d0e8367943a9..bb94451f9c6267fdf2ed03ad6ccd764de25ce6d3 100644 (file)
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -133,16 +133,20 @@ FunctionEnd
 
 Section "Binary Executable" SEC01
   Call IsDotNetInstalled
-  SetOutPath "$INSTDIR"
+  SetOutPath "$TEMP"
   SetOverwrite ifnewer
   File "vcredist_x86.exe"
-  ExecWait "$INSTDIR\vcredist_x86.exe"
+  ExecWait "$TEMP\vcredist_x86.exe"
+  SetOutPath "$INSTDIR"
+  SetOverwrite ifnewer
   File "..\bin\${BUILD}\InspGUI.exe"
   CreateDirectory "$SMPROGRAMS\InspIRCd"
   CreateShortCut "$SMPROGRAMS\InspIRCd\InspIRCd.lnk" "$INSTDIR\InspGUI.exe"
   SetOutPath "$INSTDIR\bin"
   SetOverwrite ifnewer
   File "..\bin\${BUILD}\bin\inspircd.exe"
+  DetailPrint "Installing InspIRCd service..."
+  nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\bin\inspircd.exe" --installservice'
 SectionEnd
 
 Section "Config Files" SEC02
@@ -151,10 +155,15 @@ Section "Config Files" SEC02
   File "..\conf\inspircd.helpop-full.example"
   File "..\conf\inspircd.helpop.example"
   File "..\conf\inspircd.filter.example"
-  File "..\docs\inspircd.conf.example"
+  File "..\conf\inspircd.conf.example"
+  File "..\conf\opers.conf.example"
+  File "..\conf\modules.conf.example"
+  File "..\conf\links.conf.example"
   File "..\conf\inspircd.censor.example"
   File "..\conf\inspircd.rules.example"
   File "..\conf\inspircd.quotes.example"
+  SetOutPath "$INSTDIR\conf\test"
+  File "..\conf\test\test.conf"
 SectionEnd
 
 Section "Command Handlers" SEC03
@@ -242,6 +251,8 @@ Function un.onInit
 FunctionEnd
 
 Section Uninstall
+  DetailPrint "Uninstalling InspIRCd service..."
+  nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\bin\inspircd.exe" --removeservice'
   Delete "$INSTDIR\${PRODUCT_NAME}.url"
   Delete "$INSTDIR\uninst.exe"
   Delete "$INSTDIR\modules\m_*.so"