Prepare for Merge to master Branch

2 files changed, 46 insertions, 36 deletions

diff --git a/README.md b/README.md
index b078fee..cd6c525 100644
--- a/README.md
+++ b/README.md
@@ -13,16 +13,31 @@ Note: There are many Arch Install scripts out there but I wanted to create my ow
 2. Write the .iso file to an USB stick (maybe with this [tool](https://www.balena.io/etcher/)) and boot the machine from this USB stick (you could also boot a virtual machine with this .iso file).
 3. Change your keyboard layout, if needed (mind the section below).
 4. Download the script with 'curl -L archinstall.xengineering.eu > archinstall.sh'.
-5. Edit the 'settings' section with 'nano archinstall.sh', save (CTRL + o) and leave (CTRL + x) the nano editor.
+5. Edit the 'Settings' section with 'nano archinstall.sh', save (CTRL + o) and leave (CTRL + x) the nano editor.
 6. Run the script with 'bash archinstall.sh'.
 
 
 ### Change your Keyboard Layout
 
+#### German Keyboard Layout
+
 Execute 'loadkeys de-latin1' after booting to live environment, if you want to set a german keyboard layout. You have to type 'z' for 'y' in loadkeys and 'ß' for the '-' sign.
 
 
-## To Do
+## Done / Features
+
+(Last finished task first)
+
+- [x] Optimize mirrorlist
+- [x] Support coloured output
+- [x] Support UEFI and BIOS systems
+- [x] Automatic abort in case of errors
+- [x] Provide full system encryption with LUKS
+- [x] Automatic partitioning
+- [x] Write first version of archinstall.sh
+
+
+## To Do / Feature Requests
 
 (Highest priority first)
 
@@ -33,14 +48,7 @@ Execute 'loadkeys de-latin1' after booting to live environment, if you want to s
 - [ ] Implement 'guided_archinstall.py' for better usability
 
 
-## Done
-
-(Last finished task first)
+## Bugs to solve
 
-- [x] Optimize mirrorlist
-- [x] Support coloured output
-- [x] Support UEFI and BIOS systems
-- [x] Automatic abort in case of errors
-- [x] Provide full system encryption with LUKS
-- [x] Automatic partitioning
-- [x] Write first version of archinstall.sh
+- [ ] Add locale en_US.UTF-8 because it is needed by a software included
+- [ ] Sort mirrors with sed command from [Arch Wiki Mirrors Article](https://wiki.archlinux.org/index.php/Mirrors)
diff --git a/archinstall.sh b/archinstall.sh
index de09f83..69deb23 100644
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -33,36 +33,19 @@
 set -e
 
 
-# greetings
-
-cat << EOF
-
-#################################################################
-#                                                               #
-#                Arch Linux Installation Script                 #
-#                                                               #
-# archinstall  Copyright (C) 2019  xengineering                 #
-# This program comes with ABSOLUTELY NO WARRANTY.               #
-# This is free software, and you are welcome to redistribute it #
-# under certain conditions. See                                 #
-# <https://www.gnu.org/licenses/gpl-3.0.en.html> for details.   #
-#                                                               #
-#################################################################
-
-EOF
-
-
 ##############################################################################
 
-#                                settings                                    #
+                                ############
+                                # Settings #
+                                ############
 
 # Modify each entry to your needs. Leave every unknown entry as it is.
 # But make sure to EDIT 'path_to_disk'! Run "lsblk" if you are unsure, which
 # is the right one for your machine.
 
-export path_to_disk="/dev/sda"  # select the disk for installation like "/dev/sda"
+export path_to_disk="/dev/null"  # where should Arch Linux be installed (e.g. "/dev/sda")
 export hostname="archlinux"  # select the hostname for your installation
-export pacman_mirror_region="DE"  # select "all" for all regions
+export pacman_mirror_region="DE"  # select "all" for all regions 
 export luks_encryption="no"  # "yes" for full disk encryption, "no" for normal installation
 export path_to_timezone="/usr/share/zoneinfo/Europe/Berlin"  # choose your timezone
 export locales_to_generate="de_DE.UTF-8 UTF-8"  # currently just one option is allowed
@@ -74,12 +57,12 @@ export keymap="de-latin1"  # the keyboard layout for the installation
 
 # constants
 
-export BRANCH="devel"  # possible alternatives: "devel" or "feature_<myfeature>"
+export BRANCH="master"  # possible alternatives: "devel" or "feature_<myfeature>"
 export INTERNET_TEST_SERVER="archlinux.org"
 export INTERNET_TEST_PING_TIMEOUT=1  # in seconds
 export FIRST_STAGE_LINK="https://raw.githubusercontent.com/xengineering/archinstall/$BRANCH/stages/first_stage.sh"
 export SECOND_STAGE_LINK="https://raw.githubusercontent.com/xengineering/archinstall/$BRANCH/stages/second_stage.sh"
-export PACKAGE_LIST="base linux linux-firmware grub networkmanager nano"  # maybe this is requiered: efibootmgr
+export PACKAGE_LIST="base linux linux-firmware grub networkmanager nano"
 export DEFAULT_PASSWORD="archinstall"
 
 
@@ -99,6 +82,25 @@ function print_failed () {
 export -f print_failed
 
 
+# greetings
+
+cat << EOF
+
+#################################################################
+#                                                               #
+#                Arch Linux Installation Script                 #
+#                                                               #
+# archinstall  Copyright (C) 2019  xengineering                 #
+# This program comes with ABSOLUTELY NO WARRANTY.               #
+# This is free software, and you are welcome to redistribute it #
+# under certain conditions. See                                 #
+# <https://www.gnu.org/licenses/gpl-3.0.en.html> for details.   #
+#                                                               #
+#################################################################
+
+EOF
+
+
 # check bootmode
 
 print_ok "Checking bootmode ..."