Some structural changes.

6 files changed, 7 insertions, 36 deletions

diff --git a/bin/install_desktop.sh b/bin/configure_desktop.sh
index 940c310..1d5c568 100644
--- a/bin/install_desktop.sh
+++ b/bin/configure_desktop.sh
@@ -23,7 +23,5 @@
 ########################
 
 
-pacman --no-confirm -Syu
-pacman --noconfirm -S xorg lightdm lightdm-gtk-greeter xfce4
 systemctl enable lightdm
 localectl --no-convert set-x11-keymap de pc105 nodeadkeys
diff --git a/bin/first_stage.sh b/bin/first_stage.sh
index 629c750..ddb0f6b 100644
--- a/bin/first_stage.sh
+++ b/bin/first_stage.sh
@@ -115,7 +115,10 @@ echo ""
 echo "Going to install basic packages ..."
 sleep $DELAY
 echo ""
-pacstrap /mnt base linux linux-firmware dhcpcd
+pacstrap /mnt base linux linux-firmware dhcpcd nano sudo grub efibootmgr
+if [ "$desktop" = "yes" ]; then
+    pacstrap /mnt xorg lightdm lightdm-gtk-greeter xfce4
+fi
 echo ""
 echo "Installed basic packages - OK"
 sleep $DELAY
diff --git a/bin/install_bootloader.sh b/bin/install_bootloader.sh
index 7967a54..6e2bb8e 100644
--- a/bin/install_bootloader.sh
+++ b/bin/install_bootloader.sh
@@ -25,7 +25,6 @@
 
 # Install Grub
 
-pacman --noconfirm -Syu grub efibootmgr
 mount $1 /mnt
 grub-install --target=x86_64-efi --efi-directory=/mnt --bootloader-id=GRUB \
 --removable
diff --git a/bin/network_configuration.sh b/bin/network_configuration.sh
index 8eb73f6..b27b342 100644
--- a/bin/network_configuration.sh
+++ b/bin/network_configuration.sh
@@ -33,6 +33,8 @@ echo "" >> /etc/hosts
 echo "127.0.0.1    localhost" >> /etc/hosts
 echo "::1       localhost" >> /etc/hosts
 
+systemctl enable dhcpcd
+
 echo "Network configuration done - OK"
 echo ""
 sleep 1
diff --git a/bin/second_stage.sh b/bin/second_stage.sh
index 5c2f8d8..bd6ddf9 100644
--- a/bin/second_stage.sh
+++ b/bin/second_stage.sh
@@ -63,15 +63,10 @@ bash $REPOSITORY_PATH/bin/install_bootloader.sh $boot_partition_path
 # Desktop Installation
 
 if [ "$desktop" = "yes" ]; then
-    bash $REPOSITORY_PATH/bin/install_desktop.sh
+    bash $REPOSITORY_PATH/bin/configure_desktop.sh
 fi
 
 
-# DHCP Setup
-
-bash $REPOSITORY_PATH/bin/setup_dhcp.sh
-
-
 # Good bye chroot
 
 echo "Leaving chroot environment - OK"
diff --git a/bin/setup_dhcp.sh b/bin/setup_dhcp.sh
deleted file mode 100644
index e16dbc8..0000000
--- a/bin/setup_dhcp.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-
-#  archinstall - A minimal Installation Script for Arch Linux
-#  Copyright (C) 2019  xengineering
-
-#  This program is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-
-#  You should have received a copy of the GNU General Public License
-#  along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-
-###################
-#  setup_dhcp.sh  #
-###################
-
-
-systemctl enable dhcpcd