From 2a64f2483771ede6310b18a94e7301618d8dc4f7 Mon Sep 17 00:00:00 2001
From: xengineering <mail2xengineering@protonmail.com>
Date: Sun, 15 Dec 2019 11:39:20 +0100
Subject: Started change to new stages/util concept.

---
 archinstall.sh | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'archinstall.sh')

diff --git a/archinstall.sh b/archinstall.sh
index 50444ca..b7d9f28 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -32,11 +32,19 @@
 
 TESTSERVER="8.8.8.8"  # hostnames will not work properly
 NETWORK_DEADLINE=1  # in seconds
-REPOSITORY_URL="https://github.com/xengineering/archinstall/"
-REPOSITORY_PATH="/opt/archinstall"
-BRANCH_OR_COMMIT="master"  # select another branch name or commit hash if needed
-LOG_FILE_PATH="/var/log/archinstall.log"
-CONFIG_FILE_PATH="/etc/archinstall/config.json"
+export REPOSITORY_URL="https://github.com/xengineering/archinstall/"
+export REPOSITORY_PATH="/opt/archinstall"
+export BRANCH_OR_COMMIT="master"  # select another branch name or commit hash if needed
+export LOG_FILE_PATH="/var/log/archinstall.log"
+export CONFIG_FILE_PATH="/etc/archinstall/config.json"
+
+# PATH expansion
+
+export PATH=$PATH:$(REPOSITORY_PATH)/stages
+export PATH=$PATH:$(REPOSITORY_PATH)/util
+echo "New PATH:"
+echo $PATH
+echo ""
 
 
 # Greetings
@@ -99,5 +107,7 @@ echo ""
 
 # Launching first stage
 
-bash $REPOSITORY_PATH/bin/first_stage.sh \
-$DELAY $REPOSITORY_PATH $LOG_FILE_PATH $CONFIG_FILE_PATH | tee -a $LOG_FILE_PATH
+#bash $REPOSITORY_PATH/bin/first_stage.sh \
+#$REPOSITORY_PATH $LOG_FILE_PATH $CONFIG_FILE_PATH | tee -a $LOG_FILE_PATH
+
+bash first_stage.sh | tee -a $LOG_FILE_PATH
-- 
cgit v1.2.3-70-g09d2