Subversion Repositories vaca_plus

Compare Revisions

Regard whitespace Rev 51 → Rev 52

/vaca_plus/Caribbean.bat
60,13 → 60,16
if "%debug%"=="1" echo DEBUG: Vaca+ Directory: "%addondir%".
if "%debug%"=="1" echo DEBUG: VacaHRP Directory: "%addonhrpdir%".
 
if not exist "%addondir%\VACATION.GRP" (
if exist "%exedir%\VACATION.GRP" (
move /y "%exedir%\VACATION.GRP" "%addondir%\"
ren "%addondir%\VACATION.GRP" vacation.grp
) else (
goto novacagrp
) )
if "%vacagrpname%"=="" set vacagrpname=vacation.grp
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%exedir%\vaca15.grp" set vacagrpname=vaca15.grp
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%addondir%\vaca15.grp" set vacagrpname=vaca15.grp
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%exedir%\vacapp.grp" set vacagrpname=vacapp.grp
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%addondir%\vacapp.grp" set vacagrpname=vacapp.grp
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%exedir%\vaca13.grp" set vacagrpname=vaca13.grp
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%addondir%\vaca13.grp" set vacagrpname=vaca13.grp
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%exedir%\vacation13.grp" set vacagrpname=vacation13.grp
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" if exist "%addondir%\vacation13.grp" set vacagrpname=vacation13.grp
if not exist "%exedir%\%vacagrpname%" if not exist "%addondir%\%vacagrpname%" goto novacagrp
 
if exist vacation.grp ren vacation.grp vacation.grp
call :grpchecksum
126,7 → 129,7
if exist "%exedir%\eduke32_mus.zip" set args=%args% -geduke32_mus.zip
if exist "%addondir%" if not "%addondir%"=="%exedir%" set args=%args% -j"%addondir:\=/%"
if exist "%addonhrpdir%" if not "%addonhrpdir%"=="%exedir%" if not "%addonhrpdir%"=="%addondir%" set args=%args% -j"%addonhrpdir:\=/%"
set args=%args% -gvacation.grp -hvacation.def -xVacaEDuke.con
set args=%args% -g%vacagrpname% -hvacation.def -xVacaEDuke.con
if "%editor%"=="1" set args=%args% -namesfile VacaNames.h
if "%dp%"=="1" set args=%args% -hvaca_dp.def -xVacaDP.con
if "%xxx%"=="1" if exist "%exedir%\xxx_lite.zip" set args=%args% -gxxx_lite.zip
311,9 → 314,13
echo "%addondir%\utils\windows\win32\sha1sum.exe" not found.
goto :eof
)
echo ea0a9a77b9aee6edce76afa19eaea3a810fb2390 *vacation.grp | "%addondir%\utils\windows\win32\sha1sum.exe" --status --check -
if "%ERRORLEVEL%"=="0" set version=full && goto :eof
pushd .
if exist "%addondir%\%vacagrpname%" cd /d %addondir%
if exist "%exedir%\%vacagrpname%" cd /d %exedir%
echo ea0a9a77b9aee6edce76afa19eaea3a810fb2390 *%vacagrpname% | "%addondir%\utils\windows\win32\sha1sum.exe" --status --check -
if "%ERRORLEVEL%"=="0" set version=full && popd && goto :eof
if "%ERRORLEVEL%"=="1" set version=unknown
popd
goto :eof
 
:grpchecksum_results