From 2f160ff2fe82184e113ff849c09eed532c9167f3 Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Mon, 31 Dec 2018 15:31:40 +0100
Subject: [PATCH] fix elasticsearch upgrade with new docker-compose file

---
 scripts/elastic-upgrade.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/elastic-upgrade.sh b/scripts/elastic-upgrade.sh
index 225e09a86..87c189f67 100755
--- a/scripts/elastic-upgrade.sh
+++ b/scripts/elastic-upgrade.sh
@@ -319,10 +319,11 @@ upgrade_compose()
     # get current data directory
     dir=$(awk 'BEGIN { FS="\n"; RS="";} { match($0, /image: elasticsearch:2\.4(\n|.)+volumes:(\n|.)+(-.*elasticsearch\/data)/, lines); FS="[ :]+"; RS="\r\n"; split(lines[3], line); print line[2] }' "$FM_PATH/docker-compose.yml")
     # set the configuration directory
+    dir=$(echo "$dir" | sed "s^\${PWD}^$FM_PATH^")
     dir=$(echo "${dir//[$'\t\r\n ']}/config")
     # insert configuration directory into docker-compose bindings
     awk "BEGIN { FS=\"\n\"; RS=\"\";} { print gensub(/(image: elasticsearch:2\.4(\n|.)+)volumes:\n/, \"\\\\1volumes:\n      - ${dir}:/usr/share/elasticsearch/config\n\", \"g\") }" "$FM_PATH/docker-compose.yml" > "$FM_PATH/.awktmpfile" && mv "$FM_PATH/.awktmpfile" "$FM_PATH/docker-compose.yml"
-    echo -e "\nCopying ElasticSearch 2.4 configuration files from $(pwd)/docker to $dir..."
+    echo -e "\nCopying ElasticSearch 2.4 configuration files from GitHub to $dir..."
     mkdir -p "$dir"
     curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/elasticsearch.yml > "$dir/elasticsearch.yml"
     curl -sSL https://raw.githubusercontent.com/LaCasemate/fab-manager/master/docker/log4j2.properties > "$dir/log4j2.properties"