diff options
| -rwxr-xr-x | bin/taler-deployment-build | 8 | ||||
| -rwxr-xr-x | bin/taler-deployment-dbstart | 13 |
2 files changed, 7 insertions, 14 deletions
diff --git a/bin/taler-deployment-build b/bin/taler-deployment-build index 88a85db..08f7890 100755 --- a/bin/taler-deployment-build +++ b/bin/taler-deployment-build @@ -20,14 +20,6 @@ fi source $HOME/activate -# Start database: needed because testcases run after compilation -# need db -taler-deployment-arm -s -taler-deployment-arm -i taler-postgres-standalone - -# Make sure db is properly launched -sleep 3 - cd $HOME/deployment/taler-build ./invalidate.sh diff --git a/bin/taler-deployment-dbstart b/bin/taler-deployment-dbstart index f742063..2b740ee 100755 --- a/bin/taler-deployment-dbstart +++ b/bin/taler-deployment-dbstart @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# Start the local database used for Taler if necessary (because we're a +# standalone environment) and possible. + set -eu base=$HOME @@ -10,14 +13,12 @@ ulimit -c $((100 * 1024)) cd $HOME -if [[ ! -e ~/.config/taler.conf ]]; then - taler-deployment-config-generate +if [[ ! -e ~/local/bin/gnunet-arm ]]; then + echo "not starting database, since gnunet-arm is not installed" + exit fi -taler-deployment-config-sign - -taler-deployment-arm -s - if [ "${TALER_CONFIG_STANDALONE:-0}" = 1 ]; then + taler-deployment-arm -s taler-deployment-arm -i taler-postgres-standalone fi |