From f94a7ed598fab292f8c36bfe0f30aa08d9cc9594 Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Mon, 25 Aug 2008 16:11:01 +0000
Subject: Tidy up in the nsis scripts, how it installs the service and removes
 it (hide the dos box, display informational text in the installer window)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10283 e03df62e-2008-0410-955e-edbf42e46eb7
---
 win/inspircd-noextras.nsi | 6 ++++--
 win/inspircd.nsi          | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'win')

diff --git a/win/inspircd-noextras.nsi b/win/inspircd-noextras.nsi
index aeca798e9..8115f1e14 100644
--- a/win/inspircd-noextras.nsi
+++ b/win/inspircd-noextras.nsi
@@ -145,7 +145,8 @@ Section "Binary Executable" SEC01
   SetOutPath "$INSTDIR\bin"
   SetOverwrite ifnewer
   File "..\bin\${BUILD}\bin\inspircd.exe"
-  ExecWait '"$INSTDIR\bin\inspircd.exe" --installservice'
+  DetailPrint "Installing InspIRCd service..."
+  nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\bin\inspircd.exe" --installservice'
 SectionEnd
 
 Section "Config Files" SEC02
@@ -215,7 +216,8 @@ Function un.onInit
 FunctionEnd
 
 Section Uninstall
-  ExecWait '"$INSTDIR\bin\inspircd.exe" --removeservice'
+  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"
diff --git a/win/inspircd.nsi b/win/inspircd.nsi
index f21a8dd12..907b5082c 100644
--- a/win/inspircd.nsi
+++ b/win/inspircd.nsi
@@ -145,7 +145,8 @@ Section "Binary Executable" SEC01
   SetOutPath "$INSTDIR\bin"
   SetOverwrite ifnewer
   File "..\bin\${BUILD}\bin\inspircd.exe"
-  ExecWait '"$INSTDIR\bin\inspircd.exe" --installservice'
+  DetailPrint "Installing InspIRCd service..."
+  nsExec::Exec /TIMEOUT=30000 '"$INSTDIR\bin\inspircd.exe" --installservice'
 SectionEnd
 
 Section "Config Files" SEC02
@@ -245,7 +246,8 @@ Function un.onInit
 FunctionEnd
 
 Section Uninstall
-  ExecWait '"$INSTDIR\bin\inspircd.exe" --removeservice'
+  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"
-- 
cgit v1.2.3