From adeb88128882ef4d87fd0ad235f24e41c1398d56 Mon Sep 17 00:00:00 2001
From: lotus <lotus@6c8d7289-2bf4-0310-a012-ef5d649a1542>
Date: Sun, 13 Jul 2008 08:17:20 +0000
Subject: [PATCH] fix for building Windows installer

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4995 6c8d7289-2bf4-0310-a012-ef5d649a1542
---
 yacy.nsi | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/yacy.nsi b/yacy.nsi
index 3d62ecddd..e238aae07 100755
--- a/yacy.nsi
+++ b/yacy.nsi
@@ -36,7 +36,14 @@ LicenseData "gpl.txt"
 
 Section "Binaries (required)"
 	SectionIn 1 2 3 RO
-	Call ClearShortcuts
+	
+	;clear old shortcuts
+	SetShellVarContext current
+	RMDir /r "$SMPROGRAMS\YaCy"
+	Delete "$QUICKLAUNCH\YaCy-Search.lnk" ;old
+	Delete "$DESKTOP\YaCy-Search.lnk" ;old
+	Delete "$SMSTARTUP\start YaCy (no console).lnk" ;old
+	
 	SetOutPath $INSTDIR
 	
 	File /r "RELEASE\MAIN\*"
@@ -98,23 +105,14 @@ Section "Uninstall"
 	
 	;or jump to this
 	keepdata:
-	Call ClearShortcuts
+	RMDir /r "$SMPROGRAMS\YaCy"
+	Delete "$DESKTOP\YaCy.lnk"
+	Delete "$SMSTARTUP\YaCy.lnk"
 	
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\YaCy"
 	nouninstall:
 SectionEnd
 
-Function ClearShortcuts
-	SetShellVarContext current
-	
-	RMDir /r "$SMPROGRAMS\YaCy"
-	Delete "$DESKTOP\YaCy.lnk"
-	Delete "$SMSTARTUP\YaCy.lnk"
-	Delete "$QUICKLAUNCH\YaCy-Search.lnk" ;old
-	Delete "$DESKTOP\YaCy-Search.lnk" ;old
-	Delete "$SMSTARTUP\start YaCy (no console).lnk" ;old
-FunctionEnd
-
 Function GetJRE
 ; based on http://nsis.sourceforge.net/Simple_Java_Runtime_Download_Script	
 	MessageBox MB_OK "YaCy uses Java ${JRE_VERSION6}. \