From 97e3808c83f5c4e21c78565ea52c2b55bbc25db5 Mon Sep 17 00:00:00 2001
From: yito88 <yuji@phact-columba.com>
Date: Thu, 19 Oct 2023 22:42:19 +0200
Subject: [PATCH] fix scripts

---
 .github/workflows/guide-templates.yaml |  2 +-
 e2e/namada-e2e-test                    |  6 +++---
 scripts/setup-namada                   | 13 ++++++-------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/guide-templates.yaml b/.github/workflows/guide-templates.yaml
index 3bcff21220..c7ce23d840 100644
--- a/.github/workflows/guide-templates.yaml
+++ b/.github/workflows/guide-templates.yaml
@@ -30,7 +30,7 @@ jobs:
         mold: [2.1.0]
     env:
       RUSTFLAGS: '-C linker=clang -C link-arg=-fuse-ld=/usr/local/bin/mold'
-    timeout-minutes: 60
+    timeout-minutes: 90
     steps:
       - uses: actions/checkout@v3
       - uses: arduino/setup-protoc@v2
diff --git a/e2e/namada-e2e-test b/e2e/namada-e2e-test
index a109b23572..a8f8465b9e 100755
--- a/e2e/namada-e2e-test
+++ b/e2e/namada-e2e-test
@@ -4,14 +4,14 @@
 # `make build-release` and `make build-wasm-scripts` on Namada directory in advance
 # Run with `namada-e2e-test ${namada_dir}`
 
-set -xe
+set -e
 
-NAMADA_DIR=$1
-if [ -z "${NAMADA_DIR}" ]
+if [ -z "$1" ]
 then
   echo "ERROR: Namada directory should be given"
   exit 1
 fi
+NAMADA_DIR=$(cd $1 && pwd)
 cd $(dirname $0)
 HERMES_DIR=${PWD%/e2e*}
 
diff --git a/scripts/setup-namada b/scripts/setup-namada
index 49a41b3805..51c96c8787 100755
--- a/scripts/setup-namada
+++ b/scripts/setup-namada
@@ -6,16 +6,15 @@
 
 set -e
 
-
-# Get absolute path to Namada directory
-SCRIPT_DIR=$(cd $(dirname $0) && pwd)
-NAMADA_DIR=$(cd $1 && pwd)
-cd $SCRIPT_DIR
-if [ -z "${NAMADA_DIR}" ]
+if [ -z "$1" ]
 then
   echo "ERROR: Namada directory should be given"
   exit 1
 fi
+# Get absolute path to Namada directory
+SCRIPT_DIR=$(cd $(dirname $0) && pwd)
+NAMADA_DIR=$(cd $1 && pwd)
+cd $SCRIPT_DIR
 
 HERMES_DIR=${PWD%/scripts*}
 
@@ -184,4 +183,4 @@ echo "You can use Hermes with ${HERMES_DIR}/config_for_namada.toml"
 
 echo "You also want to run the following lines:"
 echo "export CHAIN_A_ID=${chain_id_a}"
-echo "export CHAIN_B_ID=${chain_id_b}"
\ No newline at end of file
+echo "export CHAIN_B_ID=${chain_id_b}"