run locale gen

diff --git a/archinstall.sh b/archinstall.sh
index 87a51cb..4f14744 100755 (executable)
--- a/archinstall.sh
+++ b/archinstall.sh
@@ -30,8 +30,9 @@ cd instantARCH
 
 chmod +x *.sh
 chmod +x **/*.sh
-
+echo "local install"
 ./localinstall.sh
-./syteminstall.sh
+echo "in-system install"
+./systeminstall.sh
 
 echo "done installing arch linux"

diff --git a/lang/locale.sh b/lang/locale.sh
index 8695fbd..7d34388 100644 (file)
--- a/lang/locale.sh
+++ b/lang/locale.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
 while [ -z "$NEWLOCALE" ]; do
-    NEWLOCALE=$(cat /etc/locale.gen | fzf --prompt 'select locale')
+    NEWLOCALE=$(cat /etc/locale.gen | grep '^#[^ ]' | fzf --prompt 'select locale')
 done
+
+NEWGEN=$(grep '[^#]*' <<<"$NEWLOCALE")
+sed -i "s/$NEWLOCALE/$NEWGEN/g" /etc/locale.gen
+locale-gen

diff --git a/network/network.sh b/network/network.sh
index f3ee6f5..fa2710c 100755 (executable)
--- a/network/network.sh
+++ b/network/network.sh
@@ -3,7 +3,7 @@
 source <(curl -Ls git.io/paperbash)
 pb dialog
 
-NEWHOSTNAME=$(textbox enter hostname)
+NEWHOSTNAME=$(textbox "enter hostname")
 
 echo "$NEWHOSTNAME" >/etc/hostname
 
@@ -12,4 +12,4 @@ echo "::1 localhost" >>/etc/hosts
 echo "127.0.1.1 $NEWHOSTNAME.localdomain $NEWHOSTNAME" >>/etc/hosts
 
 pacman -S --noconfirm networkmanager
-systemctl enable NeworkManager
+systemctl enable NetworkManager

diff --git a/systeminstall.sh b/systeminstall.sh
index fd370b5..6f13e42 100755 (executable)
--- a/systeminstall.sh
+++ b/systeminstall.sh
@@ -18,10 +18,12 @@ chrootscript() {
 }
 
 chrootscript "depend/depend"
+chrootscript "depend/depend"
 chrootscript "depend/system"
 chrootscript "chroot/chroot"
 chrootscript "chroot/drivers"
 chrootscript "lang/timezone"
+chrootscript "lang/locale"
 
 # grub: install package, install, generate config
 chrootscript "bootloader/bootloader"