Skip to content

Commit 6382112

Browse files
Improve deployment logic in deploy.bat to ensure ConvAssist is only copied if the executable does not exist
1 parent def14b1 commit 6382112

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/deploy.bat

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,14 @@ set SOURCEDIR=Applications\Install\ConvAssistApp
5353
set TARGETDIR=%INSTALLDIR%\ConvAssistApp
5454
if not exist %TARGETDIR% (
5555
mkdir %TARGETDIR%
56-
) else (
57-
del /s /q %TARGETDIR%\*
5856
)
5957
if not exist %SOURCEDIR%\ConvAssist\ (
6058
powershell -Command "Expand-Archive -Force -Path %SOURCEDIR%\ConvAssist.zip -Destination %SOURCEDIR%\ConvAssist"
6159
)
62-
call :safe_xcopy %SOURCEDIR%\ConvAssist\* %TARGETDIR%
60+
61+
if not exist %TARGETDIR%\ConvAssist.exe (
62+
call :safe_xcopy %SOURCEDIR%\ConvAssist\* %TARGETDIR%
63+
)
6364
if errorlevel 1 exit /b 1
6465

6566
:DeployAssets
@@ -256,14 +257,17 @@ set SOURCEDIR=%BASEDIR%\%LANGUAGE%\Scanners
256257
set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\Scanners
257258
if not exist %TARGETDIR% mkdir %TARGETDIR%
258259
if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
259-
if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
260260
if errorlevel 1 exit /b 1
261261

262262
set SOURCEDIR=%BASEDIR%\%LANGUAGE%\UserControls
263263
set TARGETDIR=%INSTALLDIR%\%LANGUAGE%\%BASEDIR%\UserControls
264264
if not exist %TARGETDIR% mkdir %TARGETDIR%
265265
if exist .\%SOURCEDIR%\bin\%CONFIG%\*.dll call :safe_copy .\%SOURCEDIR%\bin\%CONFIG%\*.dll %TARGETDIR%
266-
if exist .\%SOURCEDIR%\Config\*.xml call :safe_copy .\%SOURCEDIR%\Config\*.xml %TARGETDIR%
266+
if errorlevel 1 exit /b 1
267+
268+
set SOURCEDIR=ACATResources\%LANGUAGE%\
269+
set TARGETDIR=%INSTALLDIR%\%LANGUAGE%
270+
call :safe_xcopy .\%SOURCEDIR%\*.* %TARGETDIR%
267271
if errorlevel 1 exit /b 1
268272

269273
echo Completed deploying ACAT to %INSTALLDIR%

0 commit comments

Comments
 (0)