WebSVN – vaca_plus – Diff – /vaca_plus/Caribbean.bat

 @echo off
 @color 0C
 pushd .
-cd /d "%~dp0"
+chdir /d "%~dp0"
 :restart
 title Duke Caribbean: Life's A Beach Plus Launcher
 if "%editor%"=="1" title Duke Caribbean: Life's A Beach Plus Editor Launcher
 if not exist duke3d.grp echo Warning: You don't have Duke3D.grp in your directory.
 if exist vacation\ set addonhrpdir=%cd%
 :addondircheck
 if exist VACATION.PRG ren VACATION.PRG vacation.grp
-cd vaca_plus
+chdir vaca_plus
 set addondir=%cd%
 if exist vacation\ set addonhrpdir=%cd%
 if exist vaca_plus\ goto addondircheck
 if "%debug%"=="1" echo DEBUG: Vaca+ Directory: "%addondir%".
 if "%debug%"=="1" echo DEBUG: VacaHRP Directory: "%addonhrpdir%".
 ren "%addondir%\VACATION.GRP" vacation.grp
 ) else (
 goto novacagrp
 ) )
+if exist vacation.grp ren vacation.grp vacation.grp
 call :grpchecksum
 :novacagrp_return
 if not "%version%"=="demo" (
 if not exist vaca1.map goto mapextract
 if not exist vaca2.map goto mapextract
 if not exist vacadm2.map goto mapextract
 if not exist vacadm3.map goto mapextract
 if not exist vacadm4.map goto mapextract
 if not exist vacaflag_%addonver%.h266 goto updateextract
+)
-cd "%exedir%"
+chdir /d "%exedir%"
 echo.
 echo.
 echo.
 echo.
 echo.
 if "%svnpath%"=="0" if exist "%ProgramFiles(x86)%\Subversion\bin\svn.exe" set svnpath=%ProgramFiles(x86)%\Subversion\bin
 if "%svnpath%"=="0" if exist "%ProgramFiles%\TortoiseSVN\bin\svn.exe" set svnpath=%ProgramFiles%\TortoiseSVN\bin
 if "%svnpath%"=="0" if exist "%ProgramFiles(x86)%\TortoiseSVN\bin\svn.exe" set svnpath=%ProgramFiles(x86)%\TortoiseSVN\bin
 if "%svnpath%"=="0" for %%S in (svn.exe) do if exist "%%~dp$PATH:S" set svnpath=%%~dp$PATH:S
-cd /d "%addondir%"
+chdir /d "%addondir%"
 if not "%svnpath%"=="0" if exist ".svn" svn update
-cd /d "%addonhrpdir%"
+chdir /d "%addonhrpdir%"
 if not "%svnpath%"=="0" if exist ".svn" svn update
 goto end
 :novacagrp
 :ssi1
 echo You do have the Caribbean SSI file in this directory, but it has not been
 echo extracted.  It will now be unpacked.
 echo.
 pause
-md vaca15ssi
+mkdir vaca15ssi
-cd vaca15ssi
+chdir vaca15ssi
 if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
 "%addondir%\utils\windows\win32\unpackssi.exe" ..\VACA15.SSI
-move /y VACATION.PRG ..\vacation.grp
+if exist VACATION.PRG move /y VACATION.PRG ..\vacation.grp
-cd ..
+chdir ..
 if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
+if exist vacation.grp (
-rd /s /q vaca15ssi
+rmdir /s /q vaca15ssi
 goto novacagrp_done
+)
+if not exist vacation.grp (
+echo Installation Error!
+echo Contact Hendricks266 for help.
+echo.
+pause
+goto end
+)
 :ssi2
 echo You do have the Caribbean SSI file in this directory, but it has not been
 echo extracted.  It will now be unpacked.
 echo.
 pause
-md vacappssi
+mkdir vacappssi
-cd vacappssi
+chdir vacappssi
 if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
 "%addondir%\utils\windows\win32\unpackssi.exe" ..\VACAPP.SSI
-move /y VACATION.PRG ..\vacation.grp
+if exist VACATION.PRG move /y VACATION.PRG ..\vacation.grp
-cd ..
+chdir ..
 if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
+if exist vacation.grp (
-rd /s /q vacappssi
+rmdir /s /q vacappssi
 goto novacagrp_done
+)
+if not exist vacation.grp (
+echo Installation Error!
+echo Contact Hendricks266 for help.
+echo.
+pause
+goto end
+)
 :ssi3
 echo You do have the Caribbean SSI file in this directory, but it has not been
 echo extracted.  It will now be unpacked.
 echo.
 pause
-md vaca13ssi
+mkdir vaca13ssi
-cd vaca13ssi
+chdir vaca13ssi
 if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
 "%addondir%\utils\windows\win32\unpackssi.exe" ..\VACA13.SSI
 ren *.TRA *.ART
 ren *.PCS *.SCP
 ren VACA1.MAP vaca1.map
 ren *.OMD *.DMO
 ren GAME.CON VACAGAME.CON
 ren USER.CON VACAUSER.CON
 ren DEFS.CON VACADEFS.CON
 ren DUKETEAM.ANM RADLOGO.ANM
-"%addondir%\utils\windows\win32\kgroup.exe" VACATION.GRP *.ART *.SCP *.map *.MID *.ANM *.VOC *.DMO CARIB.EXE
+"%addondir%\utils\windows\win32\kgroup.exe" vacation.grp *.ART *.SCP *.map *.MID *.ANM *.VOC *.DMO CARIB.EXE
-move /y VACATION.GRP ..\vacation.grp
+if exist vacation.grp move /y vacation.grp ..\vacation.grp
 move /y *.map ..\
-cd ..
+chdir ..
 if "%debug%"=="1" echo DEBUG: Changing directory to "%cd%".
+if exist vacation.grp (
-rd /s /q vaca13ssi
+rmdir /s /q vaca13ssi
 goto novacagrp_done
+)
+if not exist vacation.grp (
+echo Installation Error!
+echo Contact Hendricks266 for help.
+echo.
+pause
+goto end
+)
 :novacagrp_done
 call :grpchecksum
 call :grpchecksum_results
 goto novacagrp_return
 if not exist vacasl.patch goto nopatch
 if not exist vacadm1.patch goto nopatch
 if not exist vacadm2.patch goto nopatch
 if not exist vacadm3.patch goto nopatch
 if not exist vacadm4.patch goto nopatch
-md vaca_preserve
+mkdir vaca_preserve
 if exist vaca*.map move /y vaca*.map vaca_preserve\
 if exist "%exedir%\vaca*.map" move /y "%exedir%\vaca*.map" vaca_preserve\
-"%addondir%\utils\windows\win32\kextract.exe" VACATION.GRP VACA*.MAP
+"%addondir%\utils\windows\win32\kextract.exe" vacation.grp VACA*.MAP
 ren VACA1.MAP vaca1.map
 ren VACA2.MAP vaca2.map
 ren VACA3.MAP vaca3.map
 ren VACA4.MAP vaca4.map
 ren VACA5.MAP vaca5.map
 echo Do not delete this file^! You will be forced to reinstall Vaca+ and repatch the maps. >vacaflag_%addonver%.h266
 attrib +r vacaflag_%addonver%.h266
 echo.
 echo Patching complete^!
 :scanning
-cd "%exedir%"
+chdir "%exedir%"
 echo.
 echo Scanning directory for potential problems.
 if exist vaca1.mhk goto mhkfound
 if exist vaca2.mhk goto mhkfound
 if exist vaca3.mhk goto mhkfound
 if exist VBeachBall.con goto confound
 if exist VBeachBather.con goto confound
 if exist VDragon.con goto confound
 if exist VSeagull.con goto confound
 :confound_done
-cd /d "%exedir%"
+chdir /d "%exedir%"
 if not exist GAME.CON "%addondir%\utils\windows\win32\kextract.exe" DUKE3D.GRP GAME.CON
 if not exist DEFS.CON "%addondir%\utils\windows\win32\kextract.exe" DUKE3D.GRP DEFS.CON
 if not exist USER.CON "%addondir%\utils\windows\win32\kextract.exe" DUKE3D.GRP USER.CON
-cd /d "%addondir%"
+chdir /d "%addondir%"
 echo.
 pause
 goto restart
 :checksum
 echo Vaca+ will have major errors if the included .con files are not used.
 goto confound_done
 :execheck
 if exist %exename%.bat goto execheck_done
-if exist ..\%exename%.exe (
+if exist %exename%.exe goto recheck
-cd ..
-goto recheck
-)
-if exist ..\..\%exename%.exe (
-cd ..\..
-goto recheck
+set prevdir=%cd%
-)
-if exist ..\..\..\%exename%.exe (
+if not "%cd%"=="%cd:~0,3%" cd ..
-cd ..\..\..
-goto recheck
-)
-if exist ..\%exename%.bat (
-cd ..
-goto execheck_done
-)
-if exist ..\..\%exename%.bat (
-cd ..\..
-goto execheck_done
-)
-if exist ..\..\..\%exename%.bat (
+if not "%cd%"=="%prevdir%" goto execheck
-cd ..\..\..
-goto execheck_done
-)
 echo Warning: You don't have %exeproper% in your directory.
+chdir /d "%~dp0"
 goto execheck_done
 :nodir
 echo.
 echo Error: "vaca_plus" data directory not found.

Subversion Repositories vaca_plus

(root)/vaca_plus/Caribbean.bat – Rev 42 → 46