fixed all issues encountered while testing

dialog
amy 3 years ago
parent 73ad0b6da9
commit 39dbcaa584

@ -245,7 +245,7 @@ clear
TZ="/usr/share/place/holder" TZ="/usr/share/place/holder"
while [[ ! -f $TZ ]]; do while [[ ! -f $TZ ]]; do
msgbox "Pick a time zone (Format: America/New_York, Europe/London, etc)" msgbox "Pick a time zone (Format: America/New_York, Europe/London, etc)"
PT="$response" PT="$msgdat"
TZ="/usr/share/zoneinfo/${PT}" TZ="/usr/share/zoneinfo/${PT}"
done done
@ -319,11 +319,12 @@ done
msgbox "Your username" msgbox "Your username"
UN="$msgdat" UN="$msgdat"
arch-chroot /mnt "useradd -m ${UN} && usermod -aG wheel ${UN}" arch-chroot /mnt useradd -m ${UN}
arch-chroot /mnt usermod -aG wheel ${UN}
inf "Set password for ${UN}" inf "Set password for ${UN}"
done="nope" done="nope"
while [[ "$done" == "nope" ]]; do while [[ "$done" == "nope" ]]; do
arch-chroot /mnt "passwd ${UN}" arch-chroot /mnt passwd ${UN}
if [[ "$(echo $?)" == "0" ]]; then if [[ "$(echo $?)" == "0" ]]; then
done="yep" done="yep"
fi fi
@ -334,14 +335,18 @@ echo "%wheel ALL=(ALL) ALL" >> /mnt/etc/sudoers
if [[ -f /mnt/efimode ]]; then if [[ -f /mnt/efimode ]]; then
rm /mnt/efimode rm /mnt/efimode
arch-chroot /mnt "grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=Crystal" arch-chroot /mnt grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=Crystal
else else
DISK=$(cat /mnt/diskn) DISK=$(cat /mnt/diskn)
rm /mnt/diskn rm /mnt/diskn
grub-install ${DISK} grub-install ${DISK}
fi fi
arch-chroot /mnt "grub-mkconfig -o /boot/grub/grub.cfg && systemctl enable NetworkManager && pacman-key --init && pacman-key --populate archlinux && pacman-key --populate crystal" arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg
arch-chroot /mnt systemctl enable NetworkManager
arch-chroot pacman-key --init
arch-chroot pacman-key --populate archlinux
arch-chroot pacman-key --populate crystal
clear clear
@ -349,7 +354,7 @@ yesno "Would you like to install a DE/WM profile?"
echo "DEP=$yn" echo "DEP=$yn"
DEP="$yn" DEP="$yn"
arch-chroot /mnt "pacman -Sy --quiet --noconfirm" arch-chroot /mnt pacman -Sy --quiet --noconfirm
if [[ "$DEP" == "0" ]]; then if [[ "$DEP" == "0" ]]; then
inf "--- Desktop Environments ---" inf "--- Desktop Environments ---"
@ -377,45 +382,45 @@ if [[ "$DEP" == "0" ]]; then
DM="" DM=""
case "$DE" in case "$DE" in
"Budgie") "Budgie")
arch-chroot /mnt "pacman -S --quiet --noconfirm budgie-desktop gnome" arch-chroot /mnt pacman -S --quiet --noconfirm budgie-desktop gnome
DM="gdm" DM="gdm"
;; ;;
"Cinnamon") "Cinnamon")
arch-chroot /mnt "pacman -S --quiet --noconfirm cinnamon" arch-chroot /mnt pacman -S --quiet --noconfirm cinnamon
DM="gdm" DM="gdm"
;; ;;
"Deepin") "Deepin")
arch-chroot /mnt "pacman -S --quiet --noconfirm deepin deepin-extra" arch-chroot /mnt pacman -S --quiet --noconfirm deepin deepin-extra
DM="lightdm" DM="lightdm"
;; ;;
"Gnome" | "GNOME" | "gnome") "Gnome" | "GNOME" | "gnome")
arch-chroot /mnt "pacman -S --quiet --noconfirm gnome gnome-extra chrome-gnome-shell" arch-chroot /mnt pacman -S --quiet --noconfirm gnome gnome-extra chrome-gnome-shell
DM="gdm" DM="gdm"
;; ;;
"KDE" | "Kde" | "kde") "KDE" | "Kde" | "kde")
arch-chroot /mnt "pacman -S --quiet --noconfirm plasma kde-applications sddm" arch-chroot /mnt pacman -S --quiet --noconfirm plasma kde-applications sddm
DM="sddm" DM="sddm"
;; ;;
"LXDE" | "lxde" | "Lxde") "LXDE" | "lxde" | "Lxde")
arch-chroot /mnt "pacman -S --quiet --noconfirm lxde" arch-chroot /mnt pacman -S --quiet --noconfirm lxde
DM="lxdm" DM="lxdm"
;; ;;
"LXQt" | "lxqt" | "Lxqt" | "LXQT") "LXQt" | "lxqt" | "Lxqt" | "LXQT")
arch-chroot /mnt "pacman -S --quiet --noconfirm lxqt breeze-icons xorg" arch-chroot /mnt pacman -S --quiet --noconfirm lxqt breeze-icons xorg
DM="sddm" DM="sddm"
;; ;;
"Mate" | "mate") "Mate" | "mate")
arch-chroot /mnt "pacman -S --quiet --noconfirm mate mate-extra mate-applet-dock mate-applet-streamer" arch-chroot /mnt pacman -S --quiet --noconfirm mate mate-extra mate-applet-dock mate-applet-streamer
DM="gdm" DM="gdm"
;; ;;
"Xfce" | "xfce") "Xfce" | "xfce")
arch-chroot /mnt "pacman -S --quiet --noconfirm xfce4 xfce4-goodies" arch-chroot /mnt pacman -S --quiet --noconfirm xfce4 xfce4-goodies
DM="sddm" DM="sddm"
"Cutefish" |"cutefish") "Cutefish" |"cutefish")
arch-chroot /mnt "pacman -S --quiet --noconfirm cutefish" arch-chroot /mnt pacman -S --quiet --noconfirm cutefish
DM="sddm" DM="sddm"
"Enlightenment" | "enlightenment") "Enlightenment" | "enlightenment")
arch-chroot /mnt "pacman -S --quiet --noconfirm enlightenment terminology" arch-chroot /mnt pacman -S --quiet --noconfirm enlightenment terminology
;; ;;
esac esac
@ -432,18 +437,18 @@ if [[ "$DM" == "" ]]; then
if [[ "$ND" != "" ]]; then if [[ "$ND" != "" ]]; then
inf "Ok, we'll install $ND" inf "Ok, we'll install $ND"
DM="$ND" DM="$ND"
arch-chroot /mnt "pacman -S --quiet --noconfirm $DM" arch-chroot /mnt pacman -S --quiet --noconfirm $DM
else else
inf "Ok, not installing a display manager." inf "Ok, not installing a display manager."
fi fi
else else
arch-chroot /mnt "pacman -S --quiet --noconfirm $DM" arch-chroot /mnt pacman -S --quiet --noconfirm $DM
fi fi
if [[ "$DM" != "" ]]; then if [[ "$DM" != "" ]]; then
prompt "Would you like to enable ${DM} for ${DE}? (Y/n)" prompt "Would you like to enable ${DM} for ${DE}? (Y/n)"
useDM="$response" useDM="$response"
if [[ "$useDM" != "n" ]]; then if [[ "$useDM" != "n" ]]; then
arch-chroot /mnt "systemctl enable ${DM}" arch-chroot /mnt systemctl enable ${DM}
if [[ "$DE" == "Deepin" ]]; then if [[ "$DE" == "Deepin" ]]; then
sed -i 's/lightdm-gtk-greeter/lightdm-deepin-greeter/g' /mnt/etc/lightdm/lightdm.conf sed -i 's/lightdm-gtk-greeter/lightdm-deepin-greeter/g' /mnt/etc/lightdm/lightdm.conf
fi fi
@ -460,13 +465,13 @@ if [["$MP" != "n" ]]; then
prompt "Write package names" prompt "Write package names"
PKGNS="$response" PKGNS="$response"
inf "Installing: $PKGNS" inf "Installing: $PKGNS"
arch-chroot /mnt "ame -S ${PKGNS}" arch-chroot /mnt ame -S ${PKGNS}
else else
prompt "URL to package list" prompt "URL to package list"
SRC="$response" SRC="$response"
PKGS="$(curl ${SRC})" PKGS="$(curl ${SRC})"
for PKG in PKGS; do for PKG in PKGS; do
arch-chroot /mnt "ame -S ${PKG}" arch-chroot /mnt ame -S ${PKG}
done done
fi fi
fi fi

Loading…
Cancel
Save