[taler-grid5k] 41/73: update installer script

[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 44fb4921ccda96845598f6f13725184be11385f5
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Wed Dec 1 17:16:35 2021 +0100

    update installer script
---
 experiment/README.md          |  3 ++-
 experiment/scripts/install.sh | 31 +++++++++----------------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/experiment/README.md b/experiment/README.md
index c34bb9a..c6a230e 100644
--- a/experiment/README.md
+++ b/experiment/README.md
@@ -51,7 +51,8 @@ export EXCHANGE_COMMIT_SHA=master
 export MERCHANT_COMMIT_SHA=master
 export WALLET_COMMIT_SHA=master
 
-./scripts/install.sh
+/bin/bash /root/taler/scripts/install.sh
+# /bin/bash /root/scripts/install.sh
 ```
 
 ## Actions in running Experiment
diff --git a/experiment/scripts/install.sh b/experiment/scripts/install.sh
old mode 100644
new mode 100755
index 63ee692..a93af99
--- a/experiment/scripts/install.sh
+++ b/experiment/scripts/install.sh
@@ -2,17 +2,6 @@
 
 TALER_HOME=~/taler
 
-# Run a command and fail when there was an error
-# $1: Command to run
-# $2: Log file to write to (default /dev/null)
-function run_command() {
-  if ! $(eval ${1} > "${2:-/dev/null}" 2>&1) ; then
-    echo "ERROR cmd ${1} failed"
-    cat "${2}" || true
-    exit 1 
-  fi
-}
-
 # Prepare the repository
 # $1: Git repo to clone
 # $2: Commit to checkout to
@@ -28,14 +17,12 @@ function prepare() {
 
 function build() {
   echo "INFO running bootstrap and configure"
-  run_command "./bootstrap" "bootstrap.log" 
+  ./bootstrap
   if [ -f contrib/gana.sh ]; then
-    run_command "./contrib/gana.sh" "gana.log"
+    ./contrib/gana.sh
   fi
-  run_command \
-    "(./configure --enable-logging=verbose --prefix=/usr || ./configure)" \
-    "configure.log"
-  run_command "make" "make.log"
+  ./configure --enable-logging=verbose --prefix=/usr || ./configure
+  make
 }
 
 # Install from a git repo
@@ -45,7 +32,7 @@ function install() {
   prepare "$1" "$2" 
   build 
   echo "INFO installing"
-  run_command "make install" "install.log"
+  make install
   ldconfig
 }
 
@@ -53,18 +40,18 @@ if [ ! -d "${TALER_HOME}" ]; then
   mkdir "${TALER_HOME}"
 fi
 
-echo "INFO preparing GNUnet"
+echo "INFO installing GNUnet"
 install "https://git.gnunet.org/gnunet.git"; \
         "${GNUNET_COMMIT_SHA:-master}"
 
-echo "INFO preparing Taler Exchange"
+echo "INFO installing Taler Exchange"
 install "https://git.taler.net/exchange.git"; \
         "${EXCHANGE_COMMIT_SHA:-master}"
 
-echo "INFO preparing Taler Merchant"
+echo "INFO installing Taler Merchant"
 install "https://git.taler.net/merchant.git"; \
         "${MERCHANT_COMMIT_SHA:-master}"
 
-echo "INFO preparing Taler Wallet"
+echo "INFO installing Taler Wallet"
 install "https://git.taler.net/wallet-core.git"; \
         "${WALLET_COMMIT_SHA:-master}"

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