sed fuckup :)

pull/3/head
Amy 3 years ago
parent 9e14556177
commit d82d2d7f6f
No known key found for this signature in database
GPG Key ID: 6672E6DD65BEA50B

@ -363,7 +363,7 @@ echo "# Enabled by Crystalinstall (citrine)" >> /mnt/etc/sudoers
echo "%wheel ALL=(ALL) ALL" >> /mnt/etc/sudoers echo "%wheel ALL=(ALL) ALL" >> /mnt/etc/sudoers
if [[ "$EFI" == "yes" ]]; then if [[ "$EFI" == "yes" ]]; then
root="$(findmnt -n -o SOURCE /mnt/ | awk 'BEGIN { FS = "/" }; { print $3 }')" root="$(findmnt -n -o SOURCE / | awk 'BEGIN { FS = "/" }; { print $3 }' | sed "s/\[//")"
arch-chroot /mnt refind-install arch-chroot /mnt refind-install
echo '"Crystal Linux" "rw root=/dev/placeholder rootflags=subvol=@"' > /mnt/boot/refind_linux.conf echo '"Crystal Linux" "rw root=/dev/placeholder rootflags=subvol=@"' > /mnt/boot/refind_linux.conf
sed -i "s/placeholder/$root/" /mnt/boot/refind_linux.conf sed -i "s/placeholder/$root/" /mnt/boot/refind_linux.conf
@ -402,40 +402,40 @@ while [[ "$DE" == "" ]]; do
DE="" DE=""
fi fi
fi fi
done if [[ "$DE" == "Onyx" ]]; then
if [[ "$DE" == "Onyx" ]]; then
#arch-chroot /mnt pacman -S --quiet --noconfirm onyx #arch-chroot /mnt pacman -S --quiet --noconfirm onyx
#DM="lightdm" #DM="lightdm"
dumptitle="Desktop Environment" dumptitle="Desktop Environment"
dump "Onyx is not supported yet, please choose another DE" dump "Onyx is not supported yet, please choose another DE"
DE="" DE=""
elif [[ "$DE" == "Onyx tiling" ]]; then elif [[ "$DE" == "Onyx tiling" ]]; then
#arch-chroot /mnt pacman -S --quiet --noconfirm onyx-tiling #arch-chroot /mnt pacman -S --quiet --noconfirm onyx-tiling
#DM="lightdm" #DM="lightdm"
dumptitle="Desktop Environment" dumptitle="Desktop Environment"
dump "Onyx is not supported yet, please choose another DE" dump "Onyx is not supported yet, please choose another DE"
DE="" DE=""
elif [[ "$DE" == "Gnome" ]]; then elif [[ "$DE" == "Gnome" ]]; then
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"
elif [[ "$DE" == "KDE" ]]; then elif [[ "$DE" == "KDE" ]]; then
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"
elif [[ "$DE" == "budgie" ]]; then elif [[ "$DE" == "budgie" ]]; then
arch-chroot /mnt pacman -S --quiet --noconfirm budgie-desktop gnome arch-chroot /mnt pacman -S --quiet --noconfirm budgie-desktop gnome
DM="gdm" DM="gdm"
elif [[ "$DE" == "Mate" ]]; then elif [[ "$DE" == "Mate" ]]; then
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"
elif [[ "$DE" == "Pantheon" ]]; then elif [[ "$DE" == "Pantheon" ]]; then
arch-chroot /mnt su - ${UN} -c "ame -S gala wingpanel pantheon-applications-menu plank pantheon-geoclue2-agent pantheon-polkit-agent pantheon-print pantheon-settings-daemon lightdm lightdm-pantheon-greeter pantheon-default-settings elementary-icon-theme elementary-wallpapers gtk-theme-elementary ttf-droid ttf-opensans ttf-roboto sound-theme-elementary capnet-assist epiphany pantheon-calculator pantheon-calendar pantheon-camera pantheon-code pantheon-files pantheon-mail pantheon-music pantheon-photos pantheon-screencast pantheon-shortcut-overlay pantheon-terminal pantheon-videos simple-scan pantheon-session pantheon switchboard-plugin-desktop" > /mnt/pantheon-packages.txt arch-chroot /mnt su - ${UN} -c "ame -S gala wingpanel pantheon-applications-menu plank pantheon-geoclue2-agent pantheon-polkit-agent pantheon-print pantheon-settings-daemon lightdm lightdm-pantheon-greeter pantheon-default-settings elementary-icon-theme elementary-wallpapers gtk-theme-elementary ttf-droid ttf-opensans ttf-roboto sound-theme-elementary capnet-assist epiphany pantheon-calculator pantheon-calendar pantheon-camera pantheon-code pantheon-files pantheon-mail pantheon-music pantheon-photos pantheon-screencast pantheon-shortcut-overlay pantheon-terminal pantheon-videos simple-scan pantheon-session pantheon switchboard-plugin-desktop" > /mnt/pantheon-packages.txt
DM="lightdm" DM="lightdm"
elif [[ "$DE" == "Enlightenment" ]]; then elif [[ "$DE" == "Enlightenment" ]]; then
arch-chroot /mnt pacman -S --quiet --noconfirm enlightenment terminology arch-chroot /mnt pacman -S --quiet --noconfirm enlightenment terminology
elif [[ "$DE" == "Xfce" ]]; then elif [[ "$DE" == "Xfce" ]]; then
arch-chroot /mnt pacman -S --quiet --noconfirm xfce4 xfce4-goodies arch-chroot /mnt pacman -S --quiet --noconfirm xfce4 xfce4-goodies
DM="lightdm" DM="lightdm"
fi fi
done
if [[ "$DM" == "" ]]; then if [[ "$DM" == "" ]]; then
inf "Your selected DE/WM doesn't have a standard display manager. Enter one of the below names, or leave blank for none" inf "Your selected DE/WM doesn't have a standard display manager. Enter one of the below names, or leave blank for none"

Loading…
Cancel
Save