From c982c1b3283a1eba6ca165774aa5bc2dc4f0fc6b Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 10 Nov 2021 16:45:27 +0100
Subject: [PATCH 1/2] Make separate folders for different networks

---
 shell_scripts/lukso | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/shell_scripts/lukso b/shell_scripts/lukso
index f2dd98c..14b7657 100755
--- a/shell_scripts/lukso
+++ b/shell_scripts/lukso
@@ -336,6 +336,23 @@ pick_network() {
   if [[ ! -d /opt/lukso/networks/"$NETWORK" ]]; then
     download_network_config $NETWORK
   fi
+
+  if [[ -z $OVERRIDE_DATADIR ]]; then
+    DATADIR="$LUKSO_HOME/$NETWORK/datadirs"
+  fi
+
+  if [[ -z $OVERRIDE_LOGSDIR ]]; then
+    LOGSDIR="$LUKSO_HOME/$NETWORK/logs"
+  fi
+
+  if [[ -z $OVERRIDE_KEYS_DIR ]]; then
+    KEYS_DIR="$LUKSO_HOME/$NETWORK"
+  fi
+
+  if [[ -z $OVERRIDE_WALLET_DIR ]]; then
+    WALLET_DIR="$LUKSO_HOME/$NETWORK/vanguard_wallet"
+  fi
+
 }
 
 check_validator_requirements() {
@@ -1270,7 +1287,7 @@ while getopts "$optspec" optchar; do
     network)
       val="${!OPTIND}"
       OPTIND=$(($OPTIND + 1))
-      pick_network $val
+      eval OVERRIDE_NETWORK=$val
       ;;
 
     home)
@@ -1663,6 +1680,10 @@ fi
 
 parse_config "/opt/lukso/networks/$NETWORK/config/network-config.yaml"
 
+if [[ -n $OVERRIDE_NETWORK ]]; then
+  pick_network $OVERRIDE_NETWORK
+fi
+
 # Override config file
 if [[ -n $OVERRIDE_COINBASE ]]; then
   COINBASE=$OVERRIDE_COINBASE

From c8d0fb7a06930e2c8a638a90cafccf69d5762c8b Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Thu, 25 Nov 2021 14:21:08 +0100
Subject: [PATCH 2/2] Fix wrong order

---
 shell_scripts/lukso | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell_scripts/lukso b/shell_scripts/lukso
index 14b7657..6e165f7 100755
--- a/shell_scripts/lukso
+++ b/shell_scripts/lukso
@@ -1678,12 +1678,12 @@ if [[ "$USE_CONFIG_FILE" == true ]]; then
   parse_config "$CONFIG_FILE_PATH"
 fi
 
-parse_config "/opt/lukso/networks/$NETWORK/config/network-config.yaml"
-
 if [[ -n $OVERRIDE_NETWORK ]]; then
   pick_network $OVERRIDE_NETWORK
 fi
 
+parse_config "/opt/lukso/networks/$NETWORK/config/network-config.yaml"
+
 # Override config file
 if [[ -n $OVERRIDE_COINBASE ]]; then
   COINBASE=$OVERRIDE_COINBASE