Created util files and moved stages.

23 files changed, 17 insertions, 19 deletions

diff --git a/README.md b/README.md
index c46fcb7..c210373 100644
--- a/README.md
+++ b/README.md
@@ -30,12 +30,12 @@ Execute 'loadkeys de-latin1' after booting to live environment, if you want to s
 ## To Do
 
 - [ ] Create a main User with sudo Permissions
-- [ ] Support BIOS Systems
-- [ ] Support English Localization
 - [ ] Provide LUKS Encryption
 - [ ] Support Installation with WiFi (instead of cable connection)
 - [ ] Provide recommended Package Lists
 - [ ] Modify Mirrorlist
+- [ ] Support BIOS Systems
+- [ ] Support English Localization
 - [ ] Packaged for the AUR
 - [x] Provide Installation of Desktop Environment
 - [x] Provide reusable Configuration File (json)
diff --git a/archinstall.sh b/archinstall.sh
index f205409..ce3b8e8 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -28,6 +28,18 @@
 #################################################################
 
 
+# Settings
+
+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"
+DELAY=0.5  # delay for reading messages in seconds
+
+
 # Greetings
 
 cat << EOF
@@ -47,18 +59,6 @@ cat << EOF
 EOF
 
 
-# Settings
-
-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"
-DELAY=0.5  # delay for reading messages in seconds
-
-
 # Check internet connection
 
 if ping -w $NETWORK_DEADLINE -c 1 $TESTSERVER; then
@@ -104,5 +104,5 @@ sleep $DELAY
 
 # Launching first stage
 
-bash $REPOSITORY_PATH/bin/first_stage.sh \
+bash $REPOSITORY_PATH/stages/first_stage.sh \
 $DELAY $REPOSITORY_PATH $LOG_FILE_PATH $CONFIG_FILE_PATH | tee -a $LOG_FILE_PATH
diff --git a/bin/first_stage.sh b/stages/first_stage.sh
index 858e251..6799d50 100644
--- a/bin/first_stage.sh
+++ b/stages/first_stage.sh
@@ -23,8 +23,6 @@
 ####################
 
 
-# Argument Processing
-
 DELAY=$1
 REPOSITORY_PATH=$2
 LOG_FILE_PATH=$3
@@ -33,7 +31,7 @@ CONFIG_FILE_PATH=$4
 
 mkdir $(dirname "$CONFIG_FILE_PATH")
 touch $CONFIG_FILE_PATH
-python $2/bin/write_config.py $CONFIG_FILE_PATH
+python $REPOSITORY_PATH/bin/write_config.py $CONFIG_FILE_PATH
 disk=$(python $REPOSITORY_PATH/bin/get_config_string.py $CONFIG_FILE_PATH "disk")
 disk_path=/dev/$disk
 hostname=$(python $REPOSITORY_PATH/bin/get_config_string.py $CONFIG_FILE_PATH "hostname")
@@ -140,7 +138,7 @@ echo ""
 
 # Launch second stage in chroot
 
-echo "bash $REPOSITORY_PATH/bin/second_stage.sh $hostname \
+echo "bash $REPOSITORY_PATH/stages/second_stage.sh $hostname \
 ${disk_path}1 $REPOSITORY_PATH $CONFIG_FILE_PATH $desktop" | arch-chroot /mnt
 
 
diff --git a/bin/second_stage.sh b/stages/second_stage.sh
index bd6ddf9..bd6ddf9 100644
--- a/bin/second_stage.sh
+++ b/stages/second_stage.sh
diff --git a/util/check_bootmode.sh b/util/check_bootmode.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/check_bootmode.sh
diff --git a/util/configure_bootloader.sh b/util/configure_bootloader.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/configure_bootloader.sh
diff --git a/util/configure_desktop.sh b/util/configure_desktop.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/configure_desktop.sh
diff --git a/util/configure_keyboard.sh b/util/configure_keyboard.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/configure_keyboard.sh
diff --git a/util/configure_locales.sh b/util/configure_locales.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/configure_locales.sh
diff --git a/util/configure_network.sh b/util/configure_network.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/configure_network.sh
diff --git a/util/configure_timezone.sh b/util/configure_timezone.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/configure_timezone.sh
diff --git a/util/configure_users.sh b/util/configure_users.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/configure_users.sh
diff --git a/util/copy_archinstall_config.sh b/util/copy_archinstall_config.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/copy_archinstall_config.sh
diff --git a/util/copy_archinstall_log.sh b/util/copy_archinstall_log.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/copy_archinstall_log.sh
diff --git a/util/create_filesystems.sh b/util/create_filesystems.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/create_filesystems.sh
diff --git a/util/install_archinstall.sh b/util/install_archinstall.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/install_archinstall.sh
diff --git a/util/install_packages.sh b/util/install_packages.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/install_packages.sh
diff --git a/util/mount_filesystems.sh b/util/mount_filesystems.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/mount_filesystems.sh
diff --git a/util/partition_disk.sh b/util/partition_disk.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/partition_disk.sh
diff --git a/util/print_final_message.sh b/util/print_final_message.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/print_final_message.sh
diff --git a/util/unmount_filesystems.sh b/util/unmount_filesystems.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/unmount_filesystems.sh
diff --git a/util/write_config.py b/util/write_config.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/write_config.py
diff --git a/util/write_fstab.sh b/util/write_fstab.sh
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/util/write_fstab.sh