Skip to content
Snippets Groups Projects
Commit 11bdcb9a authored by Klas Arvidsson's avatar Klas Arvidsson
Browse files

Merge branch 'devel' into 'production'

Python requirements for tal-cli need correct HOME; More failsafe on_update for tal build.

See merge request !41
parents b96ddfa2 0ff41670
No related branches found
No related tags found
No related merge requests found
...@@ -8,8 +8,10 @@ sed -i 's|url = \.\./database|url = https://oauth2:glpat-WeW_ytbQ83JMs2UnQmhe@gi ...@@ -8,8 +8,10 @@ sed -i 's|url = \.\./database|url = https://oauth2:glpat-WeW_ytbQ83JMs2UnQmhe@gi
git submodule update --init git submodule update --init
git checkout .gitmodules git checkout .gitmodules
make make clean all
cd .. cd ..
rm -f oracle
ln -s source/oracle oracle ln -s source/oracle oracle
rm -f tal
cp source/tal tal cp source/tal tal
...@@ -72,7 +72,7 @@ class aes::tal_cli ( ...@@ -72,7 +72,7 @@ class aes::tal_cli (
group => examadm, group => examadm,
cwd => '/home/examadm/tal-cli', cwd => '/home/examadm/tal-cli',
path => '/bin:/usr/bin', path => '/bin:/usr/bin',
environment => ['HOME=/home/examadm/tal-cli'], environment => ['HOME=/home/examadm'],
creates => '/home/examadm/tal-cli/source/tal', creates => '/home/examadm/tal-cli/source/tal',
command => '/home/examadm/tal-cli/on_update.sh', command => '/home/examadm/tal-cli/on_update.sh',
require => File['/home/examadm/tal-cli/on_update.sh'], require => File['/home/examadm/tal-cli/on_update.sh'],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment