From 644b2ade19f2b2a88c6aaa063f941970d30a0340 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Thu, 11 Mar 2021 16:15:51 +0100
Subject: [PATCH] Installer build improvements
---
build.sh | 2 ++
install_template.sh | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/build.sh b/build.sh
index 8ebce01..0d027e0 100755
--- a/build.sh
+++ b/build.sh
@@ -133,6 +133,8 @@ function build_installer_package {
rm tasman-webapp.war
rm tasman-embedded.jar
cp install_template.sh install.sh
+ config_dir=$(cat config.properties | grep config_directory | cut -d"=" -f2 | xargs)
+ sed -i "s/__CONFIG_DIR__/${config_dir//\//\\/}/g" install.sh
cat tasman.tar.gz >> install.sh
rm tasman.tar.gz
echo "TASMAN install.sh built"
diff --git a/install_template.sh b/install_template.sh
index 56dbf95..8776feb 100644
--- a/install_template.sh
+++ b/install_template.sh
@@ -73,10 +73,10 @@ if [[ -z "$ucd_service_url" ]]; then
fi
# TASMAN configuration directory
-echo -e "Specify TASMAN configuration directory [/etc/tasman]: \c"
+echo -e "Specify TASMAN configuration directory [__CONFIG_DIR__]: \c"
read tasman_config_dir
if [[ -z "$tasman_config_dir" ]]; then
- tasman_config_dir="/etc/tasman"
+ tasman_config_dir="__CONFIG_DIR__"
fi
mkdir -p "$tasman_config_dir"
if [ ! $? -eq 0 ]; then
--
GitLab