From 0ff41670d688b033dfa18698b710565e9cd9f472 Mon Sep 17 00:00:00 2001
From: Klas Arvidsson <klas.arvidsson@liu.se>
Date: Thu, 23 Nov 2023 00:00:44 +0100
Subject: [PATCH] Python requirements for tal-cli need correct HOME; More
failsafe on_update for tal build.
---
files/tal/on_update.sh | 4 +++-
manifests/tal_cli.pp | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/files/tal/on_update.sh b/files/tal/on_update.sh
index 77b49af..068b662 100644
--- a/files/tal/on_update.sh
+++ b/files/tal/on_update.sh
@@ -8,8 +8,10 @@ sed -i 's|url = \.\./database|url = https://oauth2:glpat-WeW_ytbQ83JMs2UnQmhe@gi
git submodule update --init
git checkout .gitmodules
-make
+make clean all
cd ..
+rm -f oracle
ln -s source/oracle oracle
+rm -f tal
cp source/tal tal
diff --git a/manifests/tal_cli.pp b/manifests/tal_cli.pp
index 0ee5b07..d4f2775 100644
--- a/manifests/tal_cli.pp
+++ b/manifests/tal_cli.pp
@@ -72,7 +72,7 @@ class aes::tal_cli (
group => examadm,
cwd => '/home/examadm/tal-cli',
path => '/bin:/usr/bin',
- environment => ['HOME=/home/examadm/tal-cli'],
+ environment => ['HOME=/home/examadm'],
creates => '/home/examadm/tal-cli/source/tal',
command => '/home/examadm/tal-cli/on_update.sh',
require => File['/home/examadm/tal-cli/on_update.sh'],
--
GitLab