[taler-grid5k] 108/141: fix variable names

[gnunet]

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

marco-boss pushed a commit to branch master
in repository grid5k.

commit 1a169ae895f5e20e8c3bf6562ddeb3d169b0c9da
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sat Nov 6 08:12:38 2021 +0100

    fix variable names
---
 image/taler-debian11.yaml | 46 +++++++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/image/taler-debian11.yaml b/image/taler-debian11.yaml
index c9e707e..96f7424 100644
--- a/image/taler-debian11.yaml
+++ b/image/taler-debian11.yaml
@@ -43,15 +43,15 @@ global:
   other_packages_no_clean: "$${taler_packages} 
$${taler_packages_no_recommends} $${taler_build_packages}" 
   taler_disable_services: "nginx postgresql prometheus 
prometheus-postgres-exporter prometheus-nginx-exporter prometheus-node-exporter"
   taler_loki_version: "v2.3.0"
-  gnunet: gnunet.tar.gz
-  exchange: exchange.tar.gz
-  merchant: merchant.tar.gz
-  wallet: wallet.tar.gz
+  gnunet_tar: gnunet.tar.gz
+  exchange_tar: exchange.tar.gz
+  merchant_tar: merchant.tar.gz
+  wallet_tar: wallet.tar.gz
   taler_path: /root/taler
-  gnunet_path: $${taler_path}/$${gnunet}
-  exchange_path: $${taler_path}/$${exchange}
-  merchant_path: $${taler_path}/$${merchant}
-  wallet_path: $${taler_path}/$${wallet}
+  gnunet_path: $${taler_path}/$${gnunet_tar}
+  exchange_path: $${taler_path}/$${exchange_tar}
+  merchant_path: $${taler_path}/$${merchant_tar}
+  wallet_path: $${taler_path}/$${wallet_tar}
   ## Other parameters can be changed, see kameleon info debian10-taler.yaml
 
 bootstrap:
@@ -71,19 +71,19 @@ setup:
     - import_gnunet:
       # kameleon_data_dir=./grid5000/steps/data
       - local2in:
-        - $${kameleon_data_dir}/$${gnunet}
+        - $${kameleon_data_dir}/$${gnunet_tar}
         - $${gnunet_path}
     - import_exchange:
       - local2in:
-        - $${kameleon_data_dir}/$${exchange}
+        - $${kameleon_data_dir}/$${exchange_tar}
         - $${exchange_path}
     - import_merchant:
       - local2in:
-        - $${kameleon_data_dir}/$${merchant}
+        - $${kameleon_data_dir}/$${merchant_tar}
         - $${merchant_path}
     - import_wallet:
       - local2in:
-        - $${kameleon_data_dir}/$${wallet}
+        - $${kameleon_data_dir}/$${wallet_tar}
         - $${wallet_path}
 
   - install:
@@ -100,9 +100,10 @@ setup:
       - exec_in: |
          cd $${taler_path} 
 
-         tar -xvf $${gnunet}
+         tar -xvf $${gnunet_tar}
          cd gnunet-* 
-         ./configure --enable-logging=verbose --prefix=/usr && make && make 
install 
+         ./configure --enable-logging=verbose --prefix=/usr
+         make install
          ldconfig
 
     - exchange:
@@ -110,28 +111,31 @@ setup:
          cd $${taler_path}
 
          pip install jinja2
-         tar -xvf $${exchange}
+         tar -xvf $${exchange_tar}
          cd taler-exchange*
-         ./configure --enable-logging=verbose --prefix=/usr && make && make 
install
+         ./configure --enable-logging=verbose --prefix=/usr
+         make install
          ldconfig
 
     - merchant:
       - exec_in: |
          cd $${taler_path}
 
-         tar -xvf $${merchant}
-         cd taler-merchant* 
-         ./configure --enable-logging=verbose --prefix=/usr && make && make 
install
+         tar -xvf $${merchant_tar}
+         cd taler-merchant*
+         ./configure --enable-logging=verbose --prefix=/usr
+         make install
          ldconfig
 
     - wallet: 
       - exec_in: |
          cd $${taler_path}
 
-         tar -xvf $${wallet}
+         tar -xvf $${wallet_tar}
          cd taler-wallet*
          npm install -g pnpm
-         ./configure && make install
+         ./configure
+         make install
 
     - loki-promtail:
       - exec_in: |

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