diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-25 16:47:14 -0600 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2017-10-25 16:47:14 -0600 |
| commit | ee5874f254b9ce2fb48bebb9b86170acf59ea488 (patch) | |
| tree | 35581a6736d5359c777a2a6b9432062a714a0524 /salt/openbook/admin_api_server | |
| parent | 45d8f4cb1b57ab946e861c31f00bea16fe616303 (diff) | |
curl cannot find JARs in installdeps.sh
Closes-Bug: IS-24
Diffstat (limited to 'salt/openbook/admin_api_server')
| -rw-r--r-- | salt/openbook/admin_api_server/files/installdeps.sh | 10 | ||||
| -rw-r--r-- | salt/openbook/admin_api_server/files/start_app.sh | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/salt/openbook/admin_api_server/files/installdeps.sh b/salt/openbook/admin_api_server/files/installdeps.sh index a4ac323..fae7690 100644 --- a/salt/openbook/admin_api_server/files/installdeps.sh +++ b/salt/openbook/admin_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["admin_api_server"]["jar_name"] }}\.[\d]+\.[\d]+\.[\d]+\.jar')) + curl -k \ -u '{{ pillar["jars"]["username"] }}:{{ pillar["jars"]["password"] }}' \ - -o "{{ pillar["admin_api_server"]["jar_name"] }}" \ - "{{ pillar["jars"]["url"] }}/{{ pillar["admin_api_server"]["jar_name"] }}" + -o ${current_jar[0]} \ + {{ pillar["jars"]["url"] }}/${current_jar[0]} exit 0 diff --git a/salt/openbook/admin_api_server/files/start_app.sh b/salt/openbook/admin_api_server/files/start_app.sh index d610377..9ebfc47 100644 --- a/salt/openbook/admin_api_server/files/start_app.sh +++ b/salt/openbook/admin_api_server/files/start_app.sh @@ -1,3 +1,4 @@ #!/bin/bash -exec java -jar {{ pillar["admin_api_server"]["jar_name"] }} run com.talligent.openbook.verticle.Startup --cluster +jar=$(find -maxdepth 1 -type f -name '{{ pillar["admin_api_server"]["jar_name"] }}*' | awk -F/ '{print $2}') +exec java -jar ${jar} run com.talligent.openbook.verticle.Startup --cluster |