From 62fd832bb93c48205b9b6fab4bc3cfe88d6cdb8b Mon Sep 17 00:00:00 2001 From: "Beale, Michael" Date: Thu, 1 May 2025 10:43:44 -0700 Subject: [PATCH] Fix directory paths and improve error handling in deploy.bat --- src/deploy.bat | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/deploy.bat b/src/deploy.bat index 98f22aa1..f70aae4c 100644 --- a/src/deploy.bat +++ b/src/deploy.bat @@ -35,8 +35,8 @@ if errorlevel 1 exit /b 1 set LANGUAGE=en -set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\WordPredictors\ConvAssist -set SOURCEDIR=Applications\Install\%LANGUAGE%\WordPredictors\ConvAssist +set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\WordPredictors\ConvAssist\ +set SOURCEDIR=Applications\Install\%LANGUAGE%\WordPredictors\ConvAssist\ if not exist %SOURCEDIR% ( echo ERROR: %SOURCEDIR% does not exist exit /b 1 @@ -59,7 +59,7 @@ if not exist %TARGETDIR% ( if not exist %SOURCEDIR%\ConvAssist\ ( powershell -Command "Expand-Archive -Force -Path %SOURCEDIR%\ConvAssist.zip -Destination %SOURCEDIR%\ConvAssist" ) -call :safe_xcopy /s /y /e /i %SOURCEDIR%\ConvAssist\* %TARGETDIR% +call :safe_xcopy %SOURCEDIR%\ConvAssist\* %TARGETDIR% if errorlevel 1 exit /b 1 :DeployAssets @@ -89,7 +89,7 @@ if not exist %TARGETDIR% mkdir %TARGETDIR% call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\Menus.dll %TARGETDIR% if errorlevel 1 exit /b 1 -call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR% +if exist .\%SOURCEDIR%\Config\ call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR% if errorlevel 1 exit /b 1 rem ------------------------------------------------