--- joko/ToolBox/Windows/VpnDial-installer/vpn.nsi	2005/11/22 16:48:26	1.9
+++ joko/ToolBox/Windows/VpnDial-installer/vpn.nsi	2005/11/22 17:35:04	1.12
@@ -1,5 +1,5 @@
 ; VpnDial.nsi
-; $Id: vpn.nsi,v 1.9 2005/11/22 16:48:26 janosch Exp $
+; $Id: vpn.nsi,v 1.12 2005/11/22 17:35:04 janosch Exp $
 ;
 ; This script can install VpnDial,
 ; has uninstall support and (optionally) installs start menu shortcuts.
@@ -177,7 +177,7 @@
   ;CreateDirectory $INSTDIR\certs\
 
   ; Put file there
-  File /r "vpndial\*.*"
+  File /r /x CVS "vpndial\*.*"
     
   ; Write the installation path into the registry
   WriteRegStr HKLM Software\NSIS_VpnDial "Install_Dir" "$INSTDIR"
@@ -274,9 +274,8 @@
 
   CreateDirectory "$SMPROGRAMS\VpnDial"
   CreateShortCut "$SMPROGRAMS\VpnDial\Uninstall.lnk" "$INSTDIR\uninstall.exe" "" "$INSTDIR\uninstall.exe" 0
-  CreateShortCut "$SMPROGRAMS\VpnDial\VpnMonitor.lnk" "$INSTDIR\bin\VpnDial.exe" "--gui --up --monitor $connectionname --net $destination_net --mask $destination_mask" "$INSTDIR\bin\VpnDial.exe" 0
-  CreateShortCut "$SMPROGRAMS\VpnDial\VpnDial.lnk" "$INSTDIR\bin\VpnDial.exe" "--dial $connectionname" "$INSTDIR\bin\VpnDial.exe" 0
-  CreateShortCut "$SMPROGRAMS\VpnDial\Zertifikate.lnk" "$INSTDIR\certs\" "" "$INSTDIR\certs\" 0
+  CreateShortCut "$SMPROGRAMS\VpnDial\VpnMonitor-$connectionname.lnk" "$INSTDIR\bin\VpnDial.exe" "--gui --up --monitor $connectionname --net $destination_net --mask $destination_mask" "$INSTDIR\bin\VpnDial.exe" 0
+  CreateShortCut "$SMPROGRAMS\VpnDial\VpnDial-$connectionname.lnk" "$INSTDIR\bin\VpnDial.exe" "--dial $connectionname" "$INSTDIR\bin\VpnDial.exe" 0
   CreateShortCut "$SMPROGRAMS\VpnDial\ZertifikatsVerwaltung.lnk" "$INSTDIR\links\IPSec.msc" "" "$INSTDIR\links\IPSec.msc" 0
   ;CreateShortCut "$SMPROGRAMS\VpnDial\README.lnk" "$INSTDIR\doc\README.txt" "" "$INSTDIR\doc\README.txt" 0
   ;CreateShortCut "$SMPROGRAMS\VpnDial\README-HTML.lnk" "$INSTDIR\doc\README.htm" "" "$INSTDIR\doc\README.htm" 0