From d70ccc430aba936b1a5c37929fb63933bfae1930 Mon Sep 17 00:00:00 2001
From: Alexsander Falcucci <alex.falcucci@gmail.com>
Date: Tue, 20 Aug 2024 12:40:21 +0200
Subject: [PATCH] chore: update project file structure and dependencies

- remove obsolete entries from `.gitignore`
- change the location where `cardano-cli` and `cardano-node` are extracted in `mkfiles-init.sh`
---
 mithril-test-lab/mithril-devnet/.gitignore    | 26 -------------------
 .../mithril-devnet/devnet-mkfiles.sh          |  1 -
 .../mithril-devnet/mkfiles/mkfiles-init.sh    |  2 +-
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/mithril-test-lab/mithril-devnet/.gitignore b/mithril-test-lab/mithril-devnet/.gitignore
index 297e924ad8f..0b665b25901 100644
--- a/mithril-test-lab/mithril-devnet/.gitignore
+++ b/mithril-test-lab/mithril-devnet/.gitignore
@@ -5,31 +5,5 @@ ipc
 artifacts
 cardano-cli
 cardano-node
-cardano-node-chairman
-cardano-submit-api
-cardano-testnet
-cardano-topology
-cardano-tracer
-bech32
-locli
-tx-generator
-libblst.dylib
-libc++.1.0.dylib
-libc++abi.1.dylib
-libcharset.1.dylib
-libcrypto.3.dylib
-libffi.8.dylib
-libgmp.10.dylib
-libiconv-nocharset.dylib
-libiconv.dylib
-libsecp256k1.2.dylib
-libsodium.23.dylib
-libssl.3.dylib
-libz.dylib
-db-analyser
-db-synthesizer
-db-truncater
-demo-acceptor
-demo-forwarder
 tmp
 *.tar.gz
diff --git a/mithril-test-lab/mithril-devnet/devnet-mkfiles.sh b/mithril-test-lab/mithril-devnet/devnet-mkfiles.sh
index 6823b8f8084..2f6b003d163 100755
--- a/mithril-test-lab/mithril-devnet/devnet-mkfiles.sh
+++ b/mithril-test-lab/mithril-devnet/devnet-mkfiles.sh
@@ -6,7 +6,6 @@ set -e
 if [[ -n $DEBUG ]]; then
     set -x
 fi
-set -x
 
 # Script directory variable
 SCRIPT_DIRECTORY=$(dirname $0)
diff --git a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh
index b77693c2e7f..eb546cb584b 100644
--- a/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh
+++ b/mithril-test-lab/mithril-devnet/mkfiles/mkfiles-init.sh
@@ -71,7 +71,7 @@ if [[ "$SKIP_CARDANO_BIN_DOWNLOAD" != "true" ]]; then
   echo ">> Downloading cardano-cli & cardano-node..."
   curl -sL "${CARDANO_BINARY_URL}" --output cardano-bin.tar.gz
   echo ">> Extracting cardano-cli & cardano-node..."
-  tar xzf cardano-bin.tar.gz ./bin || (mkdir -p ./bin && tar --strip-components=1 -C ./bin -xzf cardano-bin.tar.gz)
+  tar xzf cardano-bin.tar.gz ./bin -C "${ARTIFACTS_DIR}/" || (mkdir -p "${ARTIFACTS_DIR}/bin" && tar --strip-components=1 -C "${ARTIFACTS_DIR}/bin" -xzf cardano-bin.tar.gz)
   rm -f cardano-bin.tar.gz
 fi