gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-merchant] branch master updated: shellcheck


From: gnunet
Subject: [taler-merchant] branch master updated: shellcheck
Date: Fri, 28 Jul 2023 19:43:45 +0200

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 276f63cd shellcheck
276f63cd is described below

commit 276f63cddebccb607610e63c78fd3d7e6167987e
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jul 28 19:43:42 2023 +0200

    shellcheck
---
 src/testing/initialize_taler_system.sh | 154 ++++++++++++++++-----------------
 1 file changed, 74 insertions(+), 80 deletions(-)

diff --git a/src/testing/initialize_taler_system.sh 
b/src/testing/initialize_taler_system.sh
index 709ce3f0..6a263968 100755
--- a/src/testing/initialize_taler_system.sh
+++ b/src/testing/initialize_taler_system.sh
@@ -1,5 +1,6 @@
+#!/bin/bash
 # This file is part of TALER
-# Copyright (C) 2014-2021 Taler Systems SA
+# Copyright (C) 2014-2023 Taler Systems SA
 #
 # TALER is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as
@@ -15,12 +16,11 @@
 # License along with TALER; see the file COPYING.  If not, see
 # <http://www.gnu.org/licenses/>
 #
-## Coloring style Text shell script
-COLOR='\033[0;35m'
-NOCOLOR='\033[0m'
 
 set -eu
 
+# FIXME: migrate to taler-unified-setup.sh
+
 # Exit, with status code "skip" (no 'real' failure)
 function exit_skip() {
     echo " SKIP: $1"
@@ -37,54 +37,52 @@ function exit_fail() {
 function cleanup()
 {
     # kill main HTTP servers first
-    kill ${MERCHANT_HTTPD_PID:-X} &> /dev/null || true
-    kill ${EXCHANGE_HTTPD_PID:-X} &> /dev/null || true
-    for n in `jobs -p`
+    kill "${MERCHANT_HTTPD_PID:-X}" &> /dev/null || true
+    kill "${EXCHANGE_HTTPD_PID:-X}" &> /dev/null || true
+    for n in $(jobs -p)
     do
-        kill $n 2> /dev/null || true
+        kill "$n" 2> /dev/null || true
     done
     wait
-    rm -rf $CONF $WALLET_DB $TMP_DIR $LAST_RESPONSE
     # kill euFin
-    kill `cat libeufin-sandbox.pid 2> /dev/null` &> /dev/null || true
-    kill `cat libeufin-nexus.pid 2> /dev/null` &> /dev/null || true
+    kill "$(cat libeufin-sandbox.pid 2> /dev/null)" &> /dev/null || true
+    kill "$(cat libeufin-nexus.pid 2> /dev/null)" &> /dev/null || true
 }
 
 NEXUS_PORT=8082
-SANDBOX_URL=http://localhost:1$NEXUS_PORT
-export BANK_URL=$SANDBOX_URL/demobanks/default
+SANDBOX_URL="http://localhost:1$NEXUS_PORT";
+export BANK_URL="$SANDBOX_URL/demobanks/default"
 function get_payto_uri() {
-    export LIBEUFIN_SANDBOX_USERNAME=$1
-    export LIBEUFIN_SANDBOX_PASSWORD=$2
-    export LIBEUFIN_SANDBOX_URL=$SANDBOX_URL
-    libeufin-cli sandbox demobank info --bank-account $1 | jq --raw-output 
'.paytoUri'
+    export LIBEUFIN_SANDBOX_USERNAME="$1"
+    export LIBEUFIN_SANDBOX_PASSWORD="$2"
+    export LIBEUFIN_SANDBOX_URL="$SANDBOX_URL"
+    libeufin-cli sandbox demobank info --bank-account "$1" | jq --raw-output 
'.paytoUri'
 }
 export get_payto_uri
 
 function get_bankaccount_balance() {
-    export LIBEUFIN_SANDBOX_USERNAME=$1
-    export LIBEUFIN_SANDBOX_PASSWORD=$2
-    export LIBEUFIN_SANDBOX_URL=$SANDBOX_URL
-    libeufin-cli sandbox demobank info --bank-account $1 | jq --raw-output 
'.balance.amount'
+    export LIBEUFIN_SANDBOX_USERNAME="$1"
+    export LIBEUFIN_SANDBOX_PASSWORD="$2"
+    export LIBEUFIN_SANDBOX_URL="$SANDBOX_URL"
+    libeufin-cli sandbox demobank info --bank-account "$1" | jq --raw-output 
'.balance.amount'
 }
 export get_bankaccount_balance
 
 function get_bankaccount_transactions() {
-    export LIBEUFIN_SANDBOX_USERNAME=$1
-    export LIBEUFIN_SANDBOX_PASSWORD=$2
+    export LIBEUFIN_SANDBOX_USERNAME="$1"
+    export LIBEUFIN_SANDBOX_PASSWORD="$2"
     export LIBEUFIN_SANDBOX_URL=$SANDBOX_URL
-    libeufin-cli sandbox demobank list-transactions --bank-account $1
+    libeufin-cli sandbox demobank list-transactions --bank-account "$1"
 }
 export get_bankaccount_transactions
 
 # Exchange configuration file will be edited, so we create one
 # from the template.
-CONF=`mktemp test_template.conf-XXXXXX`
-cp test_template.conf $CONF
-
-TMP_DIR=`mktemp -d keys-tmp-XXXXXX`
-WALLET_DB=`mktemp test_wallet.json-XXXXXX`
-LAST_RESPONSE=`mktemp test_response.conf-XXXXXX`
+TMP_DIR=$(mktemp -t -d taler-merchant-test-XXXXXX)
+echo "Writing test log files to $TMP_DIR"
+CONF="$TMP_DIR/test_template.conf"
+cp test_template.conf "$CONF"
+LAST_RESPONSE="$TMP_DIR/last_response.log"
 
 # Install cleanup handler (except for kill -9)
 trap cleanup EXIT
@@ -113,35 +111,32 @@ echo " FOUND"
 
 echo -n "Generating Taler auditor, exchange and merchant configurations ..."
 
-DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
-rm -rf $DATA_DIR
+DATA_DIR=$(taler-config -f -c "$CONF" -s PATHS -o TALER_HOME)
+rm -rf "$DATA_DIR"
 
 # obtain key configuration data
-MASTER_PRIV_FILE=`taler-config -f -c ${CONF} -s "EXCHANGE-OFFLINE" -o 
"MASTER_PRIV_FILE"`
-MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
-mkdir -p $MASTER_PRIV_DIR
-gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null 2> /dev/null
-MASTER_PUB=`gnunet-ecc -p ${MASTER_PRIV_FILE}`
-EXCHANGE_URL=`taler-config -c $CONF -s EXCHANGE -o BASE_URL`
-MERCHANT_PORT=`taler-config -c $CONF -s MERCHANT -o PORT`
-MERCHANT_URL="http://localhost:${MERCHANT_PORT}/";
+MASTER_PRIV_FILE=$(taler-config -f -c "${CONF}" -s "EXCHANGE-OFFLINE" -o 
"MASTER_PRIV_FILE")
+MASTER_PRIV_DIR=$(dirname "$MASTER_PRIV_FILE")
+mkdir -p "$MASTER_PRIV_DIR"
+gnunet-ecc -g1 "$MASTER_PRIV_FILE" > /dev/null 2> /dev/null
+MASTER_PUB=$(gnunet-ecc -p "${MASTER_PRIV_FILE}")
+EXCHANGE_URL=$(taler-config -c "$CONF" -s EXCHANGE -o BASE_URL)
 AUDITOR_URL="http://localhost:8083/";
-AUDITOR_PRIV_FILE=`taler-config -f -c $CONF -s AUDITOR -o AUDITOR_PRIV_FILE`
-AUDITOR_PRIV_DIR=`dirname $AUDITOR_PRIV_FILE`
-mkdir -p $AUDITOR_PRIV_DIR
-gnunet-ecc -g1 $AUDITOR_PRIV_FILE > /dev/null 2> /dev/null
-AUDITOR_PUB=`gnunet-ecc -p $AUDITOR_PRIV_FILE`
+AUDITOR_PRIV_FILE=$(taler-config -f -c "$CONF" -s AUDITOR -o AUDITOR_PRIV_FILE)
+AUDITOR_PRIV_DIR=$(dirname "$AUDITOR_PRIV_FILE")
+mkdir -p "$AUDITOR_PRIV_DIR"
+gnunet-ecc -g1 "$AUDITOR_PRIV_FILE" > /dev/null 2> /dev/null
+AUDITOR_PUB=$(gnunet-ecc -p "$AUDITOR_PRIV_FILE")
 
 # patch configuration
 export TALER_DB=talercheck
-taler-config -c $CONF -s exchange -o MASTER_PUBLIC_KEY -V $MASTER_PUB
-taler-config -c $CONF -s merchant-exchange-default -o MASTER_KEY -V $MASTER_PUB
-taler-config -c $CONF -s exchangedb-postgres -o CONFIG -V postgres:///$TALER_DB
-taler-config -c $CONF -s auditordb-postgres -o CONFIG -V postgres:///$TALER_DB
-taler-config -c $CONF -s merchantdb-postgres -o CONFIG -V postgres:///$TALER_DB
-BANK_DB="jdbc:sqlite:$TMP_DIR/$TALER_DB"
-taler-config -c $CONF -s exchange -o KEYDIR -V "${TMP_DIR}/keydir/"
-taler-config -c $CONF -s exchange -o REVOCATION_DIR -V "${TMP_DIR}/revdir/"
+taler-config -c "$CONF" -s exchange -o MASTER_PUBLIC_KEY -V "$MASTER_PUB"
+taler-config -c "$CONF" -s merchant-exchange-default -o MASTER_KEY -V 
"$MASTER_PUB"
+taler-config -c "$CONF" -s exchangedb-postgres -o CONFIG -V 
"postgres:///$TALER_DB"
+taler-config -c "$CONF" -s auditordb-postgres -o CONFIG -V 
"postgres:///$TALER_DB"
+taler-config -c "$CONF" -s merchantdb-postgres -o CONFIG -V 
"postgres:///$TALER_DB"
+taler-config -c "$CONF" -s exchange -o KEYDIR -V "${TMP_DIR}/keydir/"
+taler-config -c "$CONF" -s exchange -o REVOCATION_DIR -V "${TMP_DIR}/revdir/"
 
 echo " OK"
 
@@ -158,8 +153,8 @@ libeufin-cli --version
 # before the exchange starts.
 echo "Setting up libeufin ..."
 # reset libeufin database
-rm -f $TALER_DB
-taler-bank-manage-testing $NEXUS_PORT $TALER_DB $EXCHANGE_URL $CONF
+rm -f "$TALER_DB"
+taler-bank-manage-testing "$NEXUS_PORT" "$TALER_DB" "$EXCHANGE_URL" "$CONF"
 
 
 
@@ -168,26 +163,25 @@ echo -n "Setting up exchange ..."
 # reset database
 dropdb $TALER_DB >/dev/null 2>/dev/null || true
 createdb $TALER_DB || exit_skip "Could not create database $TALER_DB"
-taler-exchange-dbinit -c $CONF
-taler-merchant-dbinit -c $CONF
-taler-auditor-dbinit -c $CONF
-taler-auditor-exchange -c $CONF -m $MASTER_PUB -u $EXCHANGE_URL
-taler-exchange-secmod-eddsa -c $CONF -L DEBUG 2> 
taler-exchange-secmod-eddsa.log &
-taler-exchange-secmod-rsa -c $CONF -L DEBUG 2> taler-exchange-secmod-rsa.log &
-taler-exchange-secmod-cs -c $CONF -L DEBUG 2> taler-exchange-secmod-cs.log &
-taler-exchange-httpd -c $CONF -L DEBUG 2> taler-exchange-httpd.log &
+taler-exchange-dbinit -c "$CONF"
+taler-merchant-dbinit -c "$CONF"
+taler-auditor-dbinit -c "$CONF"
+taler-auditor-exchange -c "$CONF" -m "$MASTER_PUB" -u "$EXCHANGE_URL"
+taler-exchange-secmod-eddsa -c "$CONF" -L DEBUG 2> 
taler-exchange-secmod-eddsa.log &
+taler-exchange-secmod-rsa -c "$CONF" -L DEBUG 2> taler-exchange-secmod-rsa.log 
&
+taler-exchange-secmod-cs -c "$CONF" -L DEBUG 2> taler-exchange-secmod-cs.log &
+taler-exchange-httpd -c "$CONF" -L DEBUG 2> taler-exchange-httpd.log &
 EXCHANGE_HTTPD_PID=$!
-taler-merchant-httpd -c $CONF -L DEBUG 2> taler-merchant-httpd.log &
+taler-merchant-httpd -c "$CONF" -L DEBUG 2> taler-merchant-httpd.log &
 MERCHANT_HTTPD_PID=$!
-taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log &
-WIREWATCH_PID=$!
-taler-auditor-httpd -L INFO -c $CONF 2> taler-auditor-httpd.log &
+taler-exchange-wirewatch -c "$CONF" 2> taler-exchange-wirewatch.log &
+taler-auditor-httpd -L INFO -c "$CONF" 2> taler-auditor-httpd.log &
 echo " OK"
 # Launch services
 
 echo -n "Waiting for the bank"
 # Wait for bank to be available (usually the slowest)
-for n in `seq 1 300`
+for n in $(seq 1 300)
 do
     echo -n "."
     sleep 0.1
@@ -202,7 +196,7 @@ do
     break
 done
 
-if [ 1 != $OK ]
+if [ 1 != "$OK" ]
 then
     exit_skip "Failed to launch services (bank)"
 fi
@@ -210,7 +204,7 @@ echo " OK"
 
 echo -n "Waiting for taler services "
 # Wait for all other taler services to be available
-for n in `seq 1 20`
+for n in $(seq 1 20)
 do
     echo -n "."
     sleep 0.1
@@ -225,7 +219,7 @@ do
     break
 done
 
-if [ 1 != $OK ]
+if [ 1 != "$OK" ]
 then
     exit_skip "Failed to launch taler services"
 fi
@@ -234,22 +228,22 @@ echo "OK"
 
 set +e
 echo -n 'Wait the exchange for gather its keys '
-for n in `seq 1 50`
+for n in $(seq 1 50)
 do
     echo -n "."
     sleep 0.1
     OK=0
     # exchange
-    wget --tries=3 --waitretry=0 --timeout=1 
http://localhost:8081/management/keys -o /dev/null -O $LAST_RESPONSE >/dev/null
-    DENOMS_COUNT=`jq '.future_denoms|length' < $LAST_RESPONSE`
-    SIGNKEYS_COUNT=`jq '.future_signkeys|length' < $LAST_RESPONSE`
+    wget --tries=3 --waitretry=0 --timeout=1 
http://localhost:8081/management/keys -o /dev/null -O "$LAST_RESPONSE" 
>/dev/null
+    DENOMS_COUNT=$(jq '.future_denoms|length' < "$LAST_RESPONSE")
+    SIGNKEYS_COUNT=$(jq '.future_signkeys|length' < "$LAST_RESPONSE")
     [[ -z "$SIGNKEYS_COUNT" || "$SIGNKEYS_COUNT" == "0" || -z "$DENOMS_COUNT" 
|| "$DENOMS_COUNT" == "0" ]] && continue
     OK=1
     break;
 done
 set -e
 
-if [ 1 != $OK ]
+if [ 1 != "$OK" ]
 then
     exit_skip "Failed to setup exchange keys, check secmod logs"
 fi
@@ -260,8 +254,8 @@ echo -n "Setting up keys ..."
 taler-exchange-offline -c "$CONF" \
   download \
   sign \
-  enable-account $(taler-config -c $CONF -s exchange-account-1 -o PAYTO_URI) \
-  enable-auditor $AUDITOR_PUB $AUDITOR_URL "TESTKUDOS Auditor" \
+  enable-account "$(taler-config -c "$CONF" -s exchange-account-1 -o 
PAYTO_URI)" \
+  enable-auditor "$AUDITOR_PUB" "$AUDITOR_URL" "TESTKUDOS Auditor" \
   wire-fee now iban TESTKUDOS:0.01 TESTKUDOS:0.01 \
   global-fee now TESTKUDOS:0.01 TESTKUDOS:0.01 TESTKUDOS:0.01 1h 1year 5 \
   upload &> taler-exchange-offline.log
@@ -279,7 +273,7 @@ do
     break
 done
 
-if [ 1 != $OK ]
+if [ 1 != "$OK" ]
 then
     exit_skip "Failed to setup keys"
 fi
@@ -287,6 +281,6 @@ fi
 echo " OK"
 
 echo -n "Setting up auditor signatures ..."
-taler-auditor-offline -c $CONF \
+taler-auditor-offline -c "$CONF" \
   download sign upload &> taler-auditor-offline.log
 echo " OK"

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]