X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fyaz.nsi;h=4b7460f337adbaacc1277343354ea80750f6ffef;hb=1cd88a77abb7c32e5ff938e2f4b9392d03d45ec5;hp=3969c73a78d8be717f6cc0a697180a421c1a945f;hpb=2b381dfe4c8f63130ce32e1117adf9e6be5cfa3b;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 3969c73..4b7460f 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,6 @@
-; $Id: yaz.nsi,v 1.4 2002-03-16 17:37:40 adam Exp $
+; $Id: yaz.nsi,v 1.6 2002-03-25 15:12:25 adam Exp $
 
-!define VERSION "1.8.6"
+!define VERSION "1.8.7"
 
 Name "YAZ"
 Caption "Index Data YAZ ${VERSION} Setup"
@@ -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