From ee5874f254b9ce2fb48bebb9b86170acf59ea488 Mon Sep 17 00:00:00 2001
From: Carlos Konstanski <ckonstanski@pippiandcarlos.com>
Date: Wed, 25 Oct 2017 16:47:14 -0600
Subject: curl cannot find JARs in installdeps.sh

Closes-Bug: IS-24
---
 salt/openbook/customer_api_server/files/installdeps.sh | 10 ++++++++--
 salt/openbook/customer_api_server/files/start_app.sh   |  3 ++-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'salt/openbook/customer_api_server/files')

diff --git a/salt/openbook/customer_api_server/files/installdeps.sh b/salt/openbook/customer_api_server/files/installdeps.sh
index d14d7a2..3a4f2fa 100644
--- a/salt/openbook/customer_api_server/files/installdeps.sh
+++ b/salt/openbook/customer_api_server/files/installdeps.sh
@@ -5,9 +5,15 @@ apt-get update
 apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade
 apt-get -y install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" curl python openjdk-8-jre-headless
 
+current_jar=($(curl -s \
+     -k \
+     -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \
+     {{ pillar["jars"]["url"] }} \
+    | grep -o -P '{{ pillar["customer_api_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar'))
+
 curl -k \
      -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \
-     -o "{{ pillar["customer_api_server"]["jar_name"] }}" \
-     "{{ pillar["jars"]["url"] }}/{{ pillar["customer_api_server"]["jar_name"] }}"
+     -o ${current_jar[0]} \
+     {{ pillar["jars"]["url"] }}/${current_jar[0]}
 
 exit 0
diff --git a/salt/openbook/customer_api_server/files/start_app.sh b/salt/openbook/customer_api_server/files/start_app.sh
index 6fd1f62..e18cbe3 100644
--- a/salt/openbook/customer_api_server/files/start_app.sh
+++ b/salt/openbook/customer_api_server/files/start_app.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-exec java -jar {{ pillar["customer_api_server"]["jar_name"] }} run com.talligent.openbook.verticle.Startup --cluster
+jar=$(find -maxdepth 1 -type f -name '{{ pillar["customer_api_server"]["jar_name"] }}*' | awk -F/ '{print $2}')
+exec java -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster
-- 
cgit v1.3