From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 25 Mar 2002 11:37:10 +0000 (+0000)
Subject: Service removed on uninstall/reinstall.
X-Git-Tag: YAZ.1.8.6~1
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=3f54f6b4978f7a9c8fe6c1038931e097c3db5436;p=yaz-moved-to-github.git

Service removed on uninstall/reinstall.
---

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 3969c73..c702f78 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,4 +1,4 @@
-; $Id: yaz.nsi,v 1.4 2002-03-16 17:37:40 adam Exp $
+; $Id: yaz.nsi,v 1.5 2002-03-25 11:37:10 adam Exp $
 
 !define VERSION "1.8.6"
 
@@ -39,6 +39,8 @@ Section "" ; (default section)
                  "$INSTDIR"
 	WriteINIStr "$SMPROGRAMS\YAZ\YAZ Home page.url" \
               "InternetShortcut" "URL" "http://www.indexdata.dk/yaz/"
+	CreateShortCut "$SMPROGRAMS\YAZ\Uninstall YAZ.lnk" \
+		"$INSTDIR\uninst.exe"
 	SetOutPath $INSTDIR
 	File LICENSE.txt
 	File ..\README
@@ -52,6 +54,9 @@ SectionEnd ; end of default section
 
 Section "YAZ Runtime"
 	SectionIn 12
+	IfFileExists "$INSTDIR\bin\yaz-ztest.exe" 0 Noservice
+	ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
+Noservice:
 	SetOutPath $INSTDIR\bin
 	File ..\bin\*.exe
 	File ..\bin\*.dll
@@ -133,8 +138,12 @@ Section Uninstall
 	Delete "$INSTDIR\uninst.exe"
 	DeleteRegKey HKLM "SOFTWARE\Index Data\YAZ"
 	DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\YAZ"
-	RMDir /r "$INSTDIR"
+	ExecWait '"$INSTDIR\bin\yaz-ztest" -remove'
 	RMDir /r $SMPROGRAMS\YAZ
-SectionEnd ; end of uninstall section
-
+	RMDir /r $INSTDIR
+        IfFileExists $INSTDIR 0 Removed 
+		MessageBox MB_OK|MB_ICONEXCLAMATION \
+                 "Note: $INSTDIR could not be removed."
+Removed:
+SectionEnd
 ; eof