eclair: Support different versions of ECLAIR
Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: Id0018442f9761dd5567ab8aaa68aaaf8cc4a6e99
diff --git a/eclair/relativize_urls.py b/eclair/relativize_urls.py
index 84a6a70..57c029f 100755
--- a/eclair/relativize_urls.py
+++ b/eclair/relativize_urls.py
@@ -23,6 +23,7 @@
#print(fn, relp)
with open(fn) as f:
txt = f.read()
+ txt = re.sub(r"/opt/bugseng/eclair[^/]*/", relp, txt)
txt = txt.replace("/opt/bugseng/eclair-3.12.0/", relp)
#os.rename(fn, fn + ".bak")
with open(fn, "w") as f:
diff --git a/eclair/utils.sh b/eclair/utils.sh
index 790081e..84efeb1 100644
--- a/eclair/utils.sh
+++ b/eclair/utils.sh
@@ -64,7 +64,7 @@
dir=$1
mkdir -p $dir/lib
- cp -r /opt/bugseng/eclair-3.12.0/lib/html $dir/lib
+ cp -r /opt/bugseng/eclair/lib/html $dir/lib
${_ECLAIR_UTILS_DIR}/relativize_urls.py $dir
}