backup/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IfECF_PATH_UPDATER is defined, let's use it to find ecf_updater executable

Browse Source
This commit is contained in:
Jocelyn Fiat
2012-06-19 02:36:54 -07:00
parent 89110e3568
commit 692ff182ca
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/bin/ecf_updater.bat
View File

@@ -1,7 +1,10 @@
@echo off @echo off
setlocal setlocal
set ECF_UPDATER_PATH= if "%ECF_UPDATER_PATH%" == "" goto LOCAL_ECF_UPDATER
goto start
:LOCAL_ECF_UPDATER
if exist "%~dp0ecf_updater.exe" set ECF_UPDATER_PATH=%~dp0 if exist "%~dp0ecf_updater.exe" set ECF_UPDATER_PATH=%~dp0
if "%ECF_UPDATER_PATH%" == "" goto SEARCH_ECF_UPDATER if "%ECF_UPDATER_PATH%" == "" goto SEARCH_ECF_UPDATER

13
tools/install_ewf.bat
View File

@@ -96,8 +96,17 @@ if not exist %TMP_CONTRIB_DIR%\library\text\encryption\eel %COPYCMD% %TMP_DIR%\c
rem #--- Update ecf files ---# rem #--- Update ecf files ---#
cd %TMP_TARGET_DIR% cd %TMP_TARGET_DIR%
call %~dp0\bin\ecf_updater.bat --force %2 %3 %4 %5 %6 %7 %8 %9 contrib
goto end if -%ECF_UPDATER_PATH%- == -- goto use_bin_dir
TMP_ECF_UPDATER_CMD=%ECF_UPDATER_PATH%\ecf_updater.exe
goto ecf_update
:use_bin_dir
TMP_ECF_UPDATER_CMD=%~dp0\bin\ecf_updater.bat
goto ecf_update
:ecf_update
call %ECF_UPDATER_PATH%\%TMP_ECF_UPDATER_CMD% --force %2 %3 %4 %5 %6 %7 %8 %9 contrib
:end :end
del %TMP_EXCLUDE% del %TMP_EXCLUDE%

5
tools/install_ewf.sh
View File

@@ -101,6 +101,9 @@ COPYCMDIFMISSING $TMP_CONTRIB_DIR/library/text/encryption/eel $TMP_DIR/contrib/i
#--- Update ecf files ---# #--- Update ecf files ---#
cd $TMP_TARGET_DIR cd $TMP_TARGET_DIR
$TMP_CWD/bin/ecf_updater --force --verbose --diff $2 $3 $4 $5 $6 $7 $8 $9 contrib if [ -z "$ECF_UPDATER_PATH" ]; then
ECF_UPDATER_PATH=$TMP_CWD/bin
fi
$ECF_UPDATER_PATH/ecf_updater --force --verbose --diff $2 $3 $4 $5 $6 $7 $8 $9 contrib