From 972c1b2f8c0285b7422da71f5ecd101a7340d42d Mon Sep 17 00:00:00 2001
From: Anders Harrisson <anders.harrisson@esss.se>
Date: Mon, 2 Dec 2019 12:59:56 +0100
Subject: [PATCH] Change jar filename used in startup script
---
defaults/main.yml | 2 +-
templates/phoebus.j2 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/defaults/main.yml b/defaults/main.yml
index 418a3db..40e5524 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,7 +1,7 @@
---
phoebus_installation_dir: /opt
phoebus_installations_keep: 2
-phoebus_version: 4.6.0
+phoebus_version: 4.6.0-2
phoebus_archive: "http://artifactory.esss.lu.se/artifactory/libs-release-local/se/europeanspallationsource/ics/ess-cs-studio-phoebus/{{ phoebus_version }}/ess-cs-studio-phoebus-{{ phoebus_version }}-linux.tar.gz"
phoebus_settings_path: "{{ phoebus_home }}/phoebus.ini"
phoebus_settings: {}
diff --git a/templates/phoebus.j2 b/templates/phoebus.j2
index ba44c58..f876bca 100644
--- a/templates/phoebus.j2
+++ b/templates/phoebus.j2
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
PHOEBUS_OPTS="{{ phoebus_options }}"
-PHOEBUS_JAR={{ phoebus_home }}/ess-cs-studio-phoebus-{{ phoebus_version }}.jar
+PHOEBUS_JAR={{ phoebus_home }}/ess-cs-studio-phoebus-{{ phoebus_version }}-linux.jar
if [[ -d /opt/conda/envs/csstudio/bin ]]
then
--
GitLab