fix escript and pacman

diff --git a/archinstall.sh b/archinstall.sh
index 7b88d74..0af4572 100755 (executable)
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -12,6 +12,7 @@ fi
 
 # print logo
 curl -s 'https://raw.githubusercontent.com/instantOS/instantLOGO/master/ascii.txt'
+echo ""
 
 echo "selecting fastest mirror"
 # sort mirrors
@@ -40,10 +41,10 @@ escript() {
 }
 
 escript depend/depend
-escript lang/keyboard.sh
-escript init/init.sh
-escript disk/disk.sh
-escript pacstrap/pacstrap.sh
+escript lang/keyboard
+escript init/init
+escript disk/disk
+escript pacstrap/pacstrap
 
 # scripts executed in installed environment
 chrootscript() {

diff --git a/chroot/drivers.sh b/chroot/drivers.sh
index 3b6f91f..3f67478 100644 (file)
--- a/chroot/drivers.sh
+++ b/chroot/drivers.sh
@@ -3,13 +3,10 @@ echo "installing video drivers"
 
 if lspci | grep -i vga | grep -i nvidia; then
     echo "nvidia card detected"
-    pacman -S nvidia --noconfirm
-    pacman -S nvidia-utils --noconfirm
-
+    pacman -S --noconfirm nvidia nvidia-utils
 elif lspci | grep -i vga | grep -i intel; then
     echo "intel integrated detected"
-    pacman -S xf86-video-intel --noconfirm
-    pacman -S mesa --noconfirm
+    pacman -S --noconfirm mesa xf86-video-intel
 else
     echo "other graphics detected, possibly virtualbox"
     pacman -S mesa --noconfirm

diff --git a/depend/depend.sh b/depend/depend.sh
index 2c31452..0cfa602 100755 (executable)
--- a/depend/depend.sh
+++ b/depend/depend.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
-pacman -S fzf --noconfirm
-pacman -S expect --noconfirm
-pacman -S git --noconfirm
-pacman -S dialog --noconfirm
+pacman -S --noconfirm \
+    fzf \
+    expect \
+    git \
+    dialog
 clear

diff --git a/depend/system.sh b/depend/system.sh
index 6a7899f..54c2f1d 100755 (executable)
--- a/depend/system.sh
+++ b/depend/system.sh
@@ -1,12 +1,11 @@
 #!/bin/bash
 
-pacman -S sudo --noconfirm
-
 pacman -S xorg --noconfirm
 
-pacman -S lightdm --noconfirm
-pacman -S bash --noconfirm
-pacman -S vim --noconfirm
-pacman -S openbox --noconfirm
-
-pacman -S lightdm-gtk-greeter --noconfirm
+pacman -S --noconfirm \
+    sudo \
+    lightdm \
+    bash \
+    vim \
+    openbox \
+    lightdm-gtk-greeter