updated installer script

diff --git a/winboard/install/installer/wb440.nsi b/winboard/install/installer/wb440.nsi
index f5721e1..cda476b 100644 (file)
--- a/winboard/install/installer/wb440.nsi
+++ b/winboard/install/installer/wb440.nsi
@@ -354,7 +354,7 @@ SectionGroup /e "Auxilliary Components and Engines" Profiles
         SetOutPath $INSTDIR\WinBoard\r
         CreateDirectory "$SMPROGRAMS\$START_MENU_FOLDER\Chess Engines"\r
         !insertmacro MUI_STARTMENU_WRITE_BEGIN Application\r
-        CreateShortCut "$SMPROGRAMS\$START_MENU_FOLDER\Chess Engines\Pulsar.lnk" "$INSTDIR\WinBoard\winboard.exe" "@fairy -fcp pulsar2009-9b.exe -fd ..\Pulsar -scp pulsar2009-9b.exe -sd ..\Pulsar -usePolyglotBook false -variant atomic" "$INSTDIR\WinBoard\winboard.exe" 2\r
+        CreateShortCut "$SMPROGRAMS\$START_MENU_FOLDER\Chess Engines\Pulsar.lnk" "$INSTDIR\WinBoard\winboard.exe" '@fairy -fcp "pulsar2009-9b 2" -fd ..\Pulsar -scp "pulsar2009-9b 2" -sd ..\Pulsar -usePolyglotBook false -variant atomic' "$INSTDIR\WinBoard\winboard.exe" 2\r
         !insertmacro MUI_STARTMENU_WRITE_END\r
       SectionEnd\r
 \r
@@ -428,9 +428,9 @@ Function FileAssoc
     WriteRegStr HKCR ".pgn" "" "WinBoard.PGN"\r
     WriteRegStr HKCR ".pgn" "Content Type" "application/x-chess-pgn"\r
     WriteRegStr HKCR "WinBoard.PGN" "" "Chess Game"\r
-    WriteRegStr HKCR "WinBoard.PGN\DefaultIcon" "" "$INSTDIR\WinBoard.exe,1"\r
+    WriteRegStr HKCR "WinBoard.PGN\DefaultIcon" "" "$INSTDIR\WinBoard\WinBoard.exe,1"\r
     WriteRegStr HKCR "WinBoard.PGN\Shell\Open" "" "Open"\r
-    WriteRegStr HKCR "WinBoard.PGN\Shell\Open\command" "" '"$INSTDIR\WinBoard.exe" -ini "$INSTDIR\WinBoard.ini" -ncp -lgf "%1"'\r
+    WriteRegStr HKCR "WinBoard.PGN\Shell\Open\command" "" '"$INSTDIR\WinBoard\WinBoard.exe" -ini "$INSTDIR\WinBoard\WinBoard.ini" @viewer -lgf "%1"'\r
 \r
     CheckFEN:\r
     !insertmacro MUI_INSTALLOPTIONS_READ $INI_VALUE "FA.ini" "Field 3" "State"\r
@@ -440,9 +440,9 @@ Function FileAssoc
     WriteRegStr HKCR ".fen" "" "WinBoard.FEN"\r
     WriteRegStr HKCR ".fen" "Content Type" "application/x-chess-fen"\r
     WriteRegStr HKCR "WinBoard.FEN" "" "Chess Position"\r
-    WriteRegStr HKCR "WinBoard.FEN\DefaultIcon" "" "$INSTDIR\WinBoard.exe,1"\r
+    WriteRegStr HKCR "WinBoard.FEN\DefaultIcon" "" "$INSTDIR\WinBoard\WinBoard.exe,1"\r
     WriteRegStr HKCR "WinBoard.FEN\Shell\Open" "" "Open"\r
-    WriteRegStr HKCR "WinBoard.FEN\Shell\Open\command" "" '"$INSTDIR\WinBoard.exe" -ini "$INSTDIR\WinBoard.ini" -ncp -lpf "%1"'\r
+    WriteRegStr HKCR "WinBoard.FEN\Shell\Open\command" "" '"$INSTDIR\WinBoard\WinBoard.exe" -ini "$INSTDIR\WinBoard\WinBoard.ini" @viewer -lpf "%1"'\r
 \r
     Continue:\r
 \r
@@ -648,6 +648,7 @@ Section "Uninstall"
        RMDir "$INSTDIR\SMIRF"\r
        RMDir "$INSTDIR\HaQi"\r
        RMDir "$INSTDIR\EleEye"\r
+       Delete "$INSTDIR\uninstall.exe"\r
        RMDir "$INSTDIR"\r
 \r
 \r
@@ -658,7 +659,7 @@ Section "Uninstall"
     ReadRegStr $1 HKCR ".pgn" ""\r
     StrCmp $1 "WinBoard.PGN" "" DelFEN\r
     ReadRegStr $1 HKCR "WinBoard.PGN\Shell\Open\command" ""\r
-    StrCmp $1 '"$INSTDIR\WinBoard.exe" -ini "$INSTDIR\WinBoard.ini" -ncp -lgf "%1"' "" DelFEN\r
+    StrCmp $1 '"$INSTDIR\WinBoard\WinBoard.exe" -ini "$INSTDIR\WinBoard\WinBoard.ini" @viewer -lgf "%1"' "" DelFEN\r
     DeleteRegKey HKCR ".pgn"\r
     DeleteRegKey HKCR "WinBoard.PGN"\r
 \r
@@ -667,7 +668,7 @@ Section "Uninstall"
     ReadRegStr $1 HKCR ".fen" ""\r
     StrCmp $1 "WinBoard.FEN" "" ContDelFEN\r
     ReadRegStr $1 HKCR "WinBoard.FEN\Shell\Open\command" ""\r
-    StrCmp $1 '"$INSTDIR\WinBoard.exe" -ini "$INSTDIR\WinBoard.ini" -ncp -lpf "%1"' "" ContDelFEN\r
+    StrCmp $1 '"$INSTDIR\WinBoard\WinBoard.exe" -ini "$INSTDIR\WinBoard\WinBoard.ini" @viewer -lpf "%1"' "" ContDelFEN\r
     DeleteRegKey HKCR ".fen"\r
     DeleteRegKey HKCR "WinBoard.FEN"\r
 \r