taler-deployment

commit a9b0eb1f45b5d8bbc31922507069a2cfae495f8a
parent dc55e1629e1e404feecf422e03d659cd8c7ad2b8
Author: ng0 <ng0@n0.is>
Date:   Mon, 14 Oct 2019 16:27:36 +0000

Merge branch 'master' of git.taler.net:deployment

Diffstat:
M
bin/taler-deployment
 | 
1
+
M
bin/taler-deployment-auditor-sign
 | 
2
+-
M
bin/taler-deployment-config-generate
 | 
8
++++----
M
bin/taler-deployment-hier
 | 
2
+-
M
bin/taler-deployment-keyup
 | 
5
+++--
M
bin/taler-deployment-sign
 | 
2
+-

6 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/bin/taler-deployment b/bin/taler-deployment
@@ -196,6 +196,7 @@ def build_bank(r, p):
 
 def build_landing(r, p):
     update_checkout(r, p)
+    subprocess.run(["pip3", "install", "--user", "jsmin"], check=True)
     subprocess.run(["./bootstrap"], check=True)
     pfx = Path.home() / "local"
     default_configure()
diff --git a/bin/taler-deployment-auditor-sign b/bin/taler-deployment-auditor-sign
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-if test -z $TALER_CONFIG_ENV; then
+if test -z $TALER_ENV_NAME; then
   echo Please run 'source ~/activate' beforehand.
   exit 1
 fi
diff --git a/bin/taler-deployment-config-generate b/bin/taler-deployment-config-generate
@@ -9,8 +9,8 @@
 
 set -eu
 
-if [[ -z ${TALER_CONFIG_ENV+x} ]]; then
-  echo "TALER_CONFIG_ENV not set"
+if [[ -z ${TALER_ENV_NAME+x} ]]; then
+  echo "TALER_ENV_NAME not set"
   exit 1
 fi
 
@@ -19,7 +19,7 @@ if [[ -z ${TALER_CONFIG_CURRENCY+x} ]]; then
   exit 1
 fi
 
-EXCHANGE_PUB=$(gnunet-ecc -p $HOME/deployment/private-keys/${TALER_CONFIG_ENV}-exchange-master.priv)
+EXCHANGE_PUB=$(gnunet-ecc -p $HOME/deployment/private-keys/${TALER_ENV_NAME}-exchange-master.priv)
 
 mkdir -p $HOME/.config
 
@@ -27,4 +27,4 @@ $HOME/deployment/config/generate-config \
   --exchange-pub "$EXCHANGE_PUB" \
   --currency "$TALER_CONFIG_CURRENCY" \
   --outdir $HOME/.config \
-  --envname "$TALER_CONFIG_ENV"
+  --envname "$TALER_ENV_NAME"
diff --git a/bin/taler-deployment-hier b/bin/taler-deployment-hier
@@ -8,7 +8,7 @@
 
 set -eu
 
-if test -z $TALER_CONFIG_ENV; then
+if test -z $TALER_ENV_NAME; then
   echo Please run 'source ~/activate' first.
   exit 1
 fi
diff --git a/bin/taler-deployment-keyup b/bin/taler-deployment-keyup
@@ -5,7 +5,7 @@
 
 set -eu
 
-if test -z $TALER_CONFIG_ENV; then
+if test -z $TALER_ENV_NAME; then
   echo Please run 'source $HOME/activate' first.
   exit 1
 fi
@@ -86,7 +86,7 @@ fi
 # Deploying Exchange's priv.
 if ! test -f $EXCHANGE_PRIV ; then
   mkdir -p $(dirname $EXCHANGE_PRIV)
-  cp $HOME/deployment/private-keys/${TALER_CONFIG_ENV}-exchange-master.priv $EXCHANGE_PRIV
+  cp $HOME/deployment/private-keys/${TALER_ENV_NAME}-exchange-master.priv $EXCHANGE_PRIV
   chmod 770 $EXCHANGE_PRIV
 fi
 
@@ -111,6 +111,7 @@ chmod -R 770 $EXCHANGE_WIREFEES/* || true
 taler-auditor-exchange \
   -m $EXCHANGE_PUB \
   -u $EXCHANGE_URL || ret=$?
+ret=${ret:-0}
 
 if [[ "$ret" != 4 ]] && [[ "$ret" != 0 ]]; then
   echo "unexpected exit code ($ret) of taler-auditor-exchange" >&2
diff --git a/bin/taler-deployment-sign b/bin/taler-deployment-sign
@@ -4,7 +4,7 @@
 
 set -eu
 
-if test -z $TALER_CONFIG_ENV; then
+if test -z $TALER_ENV_NAME; then
   echo Please run 'source $HOME/activate' first.
   exit 1
 fi