From 692ff182caa6f95616fce1d43cb9b0f9badf47c1 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <github@djoce.net>
Date: Tue, 19 Jun 2012 02:36:54 -0700
Subject: [PATCH] IfECF_PATH_UPDATER is defined, let's use it to find
 ecf_updater executable

---
 tools/bin/ecf_updater.bat |  5 ++++-
 tools/install_ewf.bat     | 13 +++++++++++--
 tools/install_ewf.sh      |  5 ++++-
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/tools/bin/ecf_updater.bat b/tools/bin/ecf_updater.bat
index 6866f82e..d48bd53f 100644
--- a/tools/bin/ecf_updater.bat
+++ b/tools/bin/ecf_updater.bat
@@ -1,7 +1,10 @@
 @echo off
 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 "%ECF_UPDATER_PATH%" == "" goto SEARCH_ECF_UPDATER
diff --git a/tools/install_ewf.bat b/tools/install_ewf.bat
index 03883b73..102ddeb3 100644
--- a/tools/install_ewf.bat
+++ b/tools/install_ewf.bat
@@ -96,8 +96,17 @@ if not exist %TMP_CONTRIB_DIR%\library\text\encryption\eel %COPYCMD% %TMP_DIR%\c
 rem #--- Update ecf files ---#
 
 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
 del %TMP_EXCLUDE%
diff --git a/tools/install_ewf.sh b/tools/install_ewf.sh
index 05e263d9..117de2a0 100644
--- a/tools/install_ewf.sh
+++ b/tools/install_ewf.sh
@@ -101,6 +101,9 @@ COPYCMDIFMISSING $TMP_CONTRIB_DIR/library/text/encryption/eel $TMP_DIR/contrib/i
 #--- Update ecf files ---#
 
 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