[taler-grid5k] 111/141: move expect to top for pipeline to fail if not successful

[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 c913916fd86bc596709514ca7b89b0912716baa8
Author: Boss Marco <bossm8@bfh.ch>
AuthorDate: Sun Nov 7 08:51:36 2021 +0100

    move expect to top for pipeline to fail if not successful
---
 docker/entrypoint.sh | 43 ++++++++++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 17 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 79a4be2..a4386a6 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -57,6 +57,32 @@ function install() {
   fi
 }
 
+if [ "$COPY" != false ];
+then
+  eval $(ssh-agent)
+  
+  if [[ -f "/root/cert.pem" ]]; then
+
+    if [[ "${GRID5K_CERT_PASSWD}" != "" ]]; then
+      /usr/bin/expect -c "
+      spawn ssh-add /root/cert.pem;
+      expect {
+        \"Enter passphrase for /root/cert.pem: \" {
+          exp_send ${GRID5K_CERT_PASSWD}\n;
+         exp_continue
+        }
+        \"Identity added: /root/cert.pem (/root/cert.pem)\" {
+         exp_continue
+        }
+        eof {}
+      }"
+    else 
+      ssh-add /root/cert.pem
+    fi
+
+  fi
+fi
+
 install gnunet \
       "${GNUNET_COMMIT_SHA}"
 
@@ -91,23 +117,6 @@ cd build/taler-debian11
 
 if [ -f "/root/cert.pem" ] && [ "$COPY" != false ]; then
 
-  eval $(ssh-agent)
-  
-  if [[ -f "/root/cert.pem" ]]; then
-
-    if [[ "${GRID5K_CERT_PASSWD}" != "" ]]; then
-      /usr/bin/expect -c "
-      spawn ssh-add /root/cert.pem;
-      expect \"Enter passphrase for /root/cert.pem: \";
-      send ${GRID5K_CERT_PASSWD}\n;
-      expect \"Identity added: /root/cert.pem (/root/cert.pem)\";
-      interact"
-    else 
-      ssh-add /root/cert.pem
-    fi
-
-  fi
-  
   mv taler-debian11.dsc taler-debian11.dsc.bak
   
   IFS=, read -ra G5K_HOSTS <<< "${GRID5K_DEST}" 

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