Archives
/
manjaro-architect
mirror of https://gitlab.manjaro.org/applications/manjaro-architect
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Assorted bugfixes

Browse Source
merge-requests/273/head
Chrysostomus 7 years ago
parent 1d940bb357
commit d9a3074720
3 changed files with 29 additions and 56 deletions
Show Stats Download Patch File Download Diff File

83
aif
Unescape Escape View File

@ -1899,7 +1899,7 @@ setup_graphics_card() {
# Save repetition
install_intel(){
pacstrap ${MOUNTPOINT} xf86-video-intel libva-intel-driver intel-ucode 2>/tmp/.errlog
basestrap ${MOUNTPOINT} xf86-video-intel libva-intel-driver intel-ucode 2>/tmp/.errlog
sed -i 's/MODULES=""/MODULES="i915"/' ${MOUNTPOINT}/etc/mkinitcpio.conf
# Intel microcode (Grub, Syslinux and systemd-boot).
@ -1925,7 +1925,7 @@ install_intel(){
# Save repetition
install_ati(){
pacstrap ${MOUNTPOINT} xf86-video-ati 2>/tmp/.errlog
basestrap ${MOUNTPOINT} xf86-video-ati 2>/tmp/.errlog
sed -i 's/MODULES=""/MODULES="radeon"/' ${MOUNTPOINT}/etc/mkinitcpio.conf
}
@ -1978,49 +1978,24 @@ install_ati(){
install_intel
;;
"3") # Nouveau / NVIDIA
[[ $INTEGRATED_GC == "ATI" ]] && install_ati || install_intel
pacstrap ${MOUNTPOINT} xf86-video-nouveau 2>/tmp/.errlog
arch_chroot "mhwd -a pci free 0300" 2>/tmp/.errlog
sed -i 's/MODULES=""/MODULES="nouveau"/' ${MOUNTPOINT}/etc/mkinitcpio.conf
;;
"4") # NVIDIA-GF
[[ $INTEGRATED_GC == "ATI" ]] && install_ati || install_intel
arch_chroot "pacman -Rdds --noconfirm mesa-libgl mesa"
# Set NVIDIA driver(s) to install depending on installed kernel(s)
([[ -e ${MOUNTPOINT}/boot/initramfs-linux.img ]] || [[ -e ${MOUNTPOINT}/boot/initramfs-linux-grsec.img ]] || [[ -e ${MOUNTPOINT}/boot/initramfs-linux-zen.img ]]) && NVIDIA="nvidia"
[[ -e ${MOUNTPOINT}/boot/initramfs-linux-lts.img ]] && NVIDIA="$NVIDIA nvidia-lts"
clear
pacstrap ${MOUNTPOINT} ${NVIDIA} nvidia-libgl nvidia-utils pangox-compat nvidia-settings 2>/tmp/.errlog
arch_chroot "mhwd -a pci nonfree 0300" 2>/tmp/.errlog
NVIDIA_INST=1
;;
"5") # NVIDIA-340
[[ $INTEGRATED_GC == "ATI" ]] && install_ati || install_intel
arch_chroot "pacman -Rdds --noconfirm mesa-libgl mesa"
# Set NVIDIA driver(s) to install depending on installed kernel(s)
([[ -e ${MOUNTPOINT}/boot/initramfs-linux.img ]] || [[ -e ${MOUNTPOINT}/boot/initramfs-linux-grsec.img ]] || [[ -e ${MOUNTPOINT}/boot/initramfs-linux-zen.img ]]) && NVIDIA="nvidia-340xx"
[[ -e ${MOUNTPOINT}/boot/initramfs-linux-lts.img ]] && NVIDIA="$NVIDIA nvidia-340xx-lts"
clear
pacstrap ${MOUNTPOINT} ${NVIDIA} nvidia-340xx-libgl nvidia-340xx-utils nvidia-settings 2>/tmp/.errlog
arch_chroot "mhwd -a pci nonfree 0300" 2>/tmp/.errlog
NVIDIA_INST=1
;;
"6") # NVIDIA-304
[[ $INTEGRATED_GC == "ATI" ]] && install_ati || install_intel
arch_chroot "pacman -Rdds --noconfirm mesa-libgl mesa"
# Set NVIDIA driver(s) to install depending on installed kernel(s)
([[ -e ${MOUNTPOINT}/boot/initramfs-linux.img ]] || [[ -e ${MOUNTPOINT}/boot/initramfs-linux-grsec.img ]] || [[ -e ${MOUNTPOINT}/boot/initramfs-linux-zen.img ]]) && NVIDIA="nvidia-304xx"
[[ -e ${MOUNTPOINT}/boot/initramfs-linux-lts.img ]] && NVIDIA="$NVIDIA nvidia-304xx-lts"
clear
pacstrap ${MOUNTPOINT} ${NVIDIA} nvidia-304xx-libgl nvidia-304xx-utils nvidia-settings 2>/tmp/.errlog
arch_chroot "mhwd -a pci nonfree 0300" 2>/tmp/.errlog
NVIDIA_INST=1
;;
"7") # Via
pacstrap ${MOUNTPOINT} xf86-video-openchrome 2>/tmp/.errlog
basestrap ${MOUNTPOINT} xf86-video-openchrome 2>/tmp/.errlog
;;
"8") # VirtualBox
@ -2033,7 +2008,7 @@ install_ati(){
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title "$_VBoxInstTitle" --msgbox "$_VBoxInstBody" 0 0
clear
pacstrap ${MOUNTPOINT} virtualbox-guest-utils virtualbox-guest-dkms $VB_MOD 2>/tmp/.errlog
basestrap ${MOUNTPOINT} virtualbox-guest-utils virtualbox-guest-dkms $VB_MOD 2>/tmp/.errlog
umount -l /mnt/dev
# Load modules and enable vboxservice.
@ -2042,10 +2017,10 @@ install_ati(){
echo -e "vboxguest\nvboxsf\nvboxvideo" > ${MOUNTPOINT}/etc/modules-load.d/virtualbox.conf
;;
"9") # VMWare
pacstrap ${MOUNTPOINT} xf86-video-vmware xf86-input-vmmouse 2>/tmp/.errlog
basestrap ${MOUNTPOINT} xf86-video-vmware xf86-input-vmmouse 2>/tmp/.errlog
;;
"10") # Generic / Unknown
pacstrap ${MOUNTPOINT} xf86-video-fbdev 2>/tmp/.errlog
basestrap ${MOUNTPOINT} xf86-video-fbdev 2>/tmp/.errlog
;;
*) install_graphics_menu
;;
@ -2116,7 +2091,7 @@ install_de_wm() {
if [[ $(cat ${PACKAGES}) != "" ]]; then
clear
sed -i 's/+\|\"//g' ${PACKAGES}
pacstrap ${MOUNTPOINT} $(cat ${PACKAGES}) 2>/tmp/.errlog
basestrap ${MOUNTPOINT} $(cat ${PACKAGES}) 2>/tmp/.errlog
check_for_error
@ -2145,7 +2120,7 @@ install_de_wm() {
# If at least one package, install.
if [[ $(cat ${PACKAGES}) != "" ]]; then
clear
pacstrap ${MOUNTPOINT} $(cat ${PACKAGES}) 2>/tmp/.errlog
basestrap ${MOUNTPOINT} $(cat ${PACKAGES}) 2>/tmp/.errlog
check_for_error
fi
@ -2157,7 +2132,7 @@ install_manjaro_de_wm() {
# Only show this information box once
if [[ $SHOW_ONCE -eq 0 ]]; then
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstDETitle " --msgbox "$_DEInfoBody" 0 0
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstDETitle " --msgbox "This installs a package list and a desktop-settings package that correspond to manjaro editions of the same name. At the moment, only systemd versions are supported." 0 0
SHOW_ONCE=1
fi
# Clear packages after installing base
@ -2186,54 +2161,54 @@ install_manjaro_de_wm() {
# remove openrc and kernel specific stuff and unnecesary characters
case $(cat /tmp/.desktop) in
xfce)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Xfce | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Xfce"
;;
kde)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Kde | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Kde"
;;
deepin)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Deepin | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Deepin"
;;
gnome)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-gnome | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-gnome"
;;
lxqt)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Lxqt | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Lxqt"
;;
lxde)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Lxde | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Lxde"
;;
i3)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-i3 | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-i3"
;;
bspwm)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Bspwm | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Bspwm"
;;
budgie)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Budgie | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Budgie"
;;
fluxbox)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-fluxbox | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-fluxbox"
;;
lumina)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Lumina | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Lumina"
;;
netbook)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Netbook | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Netbook"
;;
cinnamon)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Cinnamon | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Cinnamon"
;;
mate)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Mate | grep -v "openrc" | sed 's/>systemd //g' | grep -v ">i686" | sed 's/>multilib //g' | sed 's/>x86_64 //g' | awk '{print $1}' | grep-v "#" | awk 'NF > 0' | grep -v "multilib" | grep -v "KERNEL")
target_desktop="/usr/share/aif/package-lists/Packages-Mate"
;;
jwm)
target_desktop=$(cat /usr/share/aif/package-lists/Packages-Root /usr/share/aif/package-lists/Packages-Jwm | grep -v "#" | grep -v "openrc" | grep -v "KERNEL" | grep -v "multilib" | grep -v "multilib" | sed '/^\s*$/d' | sed 's/>\w\+//' | sed 's/ //g')
target_desktop="/usr/share/aif/package-lists/Packages-Jwm"
;;
esac
# sed -i 's/+\|\"//g' ${PACKAGES}
basestrap ${MOUNTPOINT} $(echo "$target_desktop") 2>/tmp/.errlog
basestrap ${MOUNTPOINT} $(cat /usr/share/aif/package-lists/Packages-Root "$target_desktop") 2>/tmp/.errlog
check_for_error

1
package-lists/Packages-Bspwm
Unescape Escape View File

@ -13,7 +13,6 @@ adwaita-maia-gtk3
networkmanager
networkmanager-dispatcher-ntpd
openresolv
dhcpd
wpa_tui
manjaro-bspwm-settings
bspwm-manjaro

1
package-lists/Packages-Root
Unescape Escape View File

@ -1,7 +1,6 @@
cronie
exfat-utils
f2fs-tools
eudev-systemd
linux-firmware
lsb-release
haveged

Write Preview
Loading…
Cancel
Save