Permalink
Browse files

Fixed wifi issue / added nvidia 390xx

  • Loading branch information...
deadhead420 committed Jul 28, 2018
1 parent 7ee579e commit 7d9cd5b0bcd53100eb4392fee9fac57d244558e6
Showing with 36 additions and 29 deletions.
  1. +1 −0 anarchy-installer.sh
  2. +11 −1 etc/anarchy.conf
  3. +6 −21 lang/anarchy-english.conf
  4. +18 −7 lib/configure_desktop.sh
View
@@ -49,6 +49,7 @@ init() {
source "$aa_conf"
language
source "$lang_file"
source "$aa_conf"
export reload=true
}
View
@@ -184,6 +184,16 @@ base_defaults="wget screenfetch vim cpupower"
de_defaults="xdg-user-dirs xorg-server xorg-apps xorg-xinit xterm ttf-dejavu gvfs gvfs-smb gvfs-mtp pulseaudio pavucontrol pulseaudio-alsa alsa-utils unzip"
extras="gvfs arc-gtk-theme elementary-icon-theme numix-icon-theme-git numix-circle-icon-theme-git htop arch-wiki-cli lynx fetchmirrors chromium libreoffice-fresh vlc qt4 gnome-packagekit pantheon-music"
### Graphics Drivers
gr1="Vesa $os $drivers"
gr2="NVIDIA $drivers"
gr4="AMD/ATI $os $drivers"
gr5="Intel $os $drivers"
gr6="NVIDIA $drivers"
gr7="NVIDIA 340xx $drivers"
gr8="NVIDIA $os $drivers"
gr9="NVIDIA 390xx $drivers"
### Added FS messages
fs6="F2FS File System"
@@ -478,7 +488,7 @@ points_orig=$(echo -e "/boot boot-mountpoint>\n/home home-mountpoint>\n/opt
if (acpi | egrep "*" &>/dev/null); then LAPTOP=true ; fi
### Check for wifi network
wifi_network=$(ip addr | grep "wlp" | awk '{print $2}' | sed 's/://' | head -n 1)
wifi_network=$(ip addr | grep "wlp\|wlo" | awk '{print $2}' | sed 's/://' | head -n 1)
if [ -n "$wifi_network" ]; then wifi=true ; fi
### Check system architecture
View
@@ -99,6 +99,10 @@ none="None"
select="Select"
drivers="Drivers"
os="Open Source"
custom_msg="Enter a new custom mount point: \n\n $a Will be mounted under Root '/'"
custom_err_msg0="\n$error New mount point can't contain special characters..."
@@ -355,6 +359,8 @@ nvidia_modeset_msg="Would you like to enable Nvidia DRM kernel mode setting? \n\
nvidia_340msg="Your chipset is supported by nvidia-340xx legacy drivers. \n\n $a Continue installing nvidia-340xx? graphics drivers"
nvidia_390msg="Your chipset is supported by nvidia-390xx legacy drivers. \n\n $a Continue installing nvidia-390xx? graphics drivers"
nvidia_curmsg="Your chipset is supported by the latest nvidia drivers. \n\n $a Continue installing nvidia graphics drivers?"
ucode_msg="Would you like to install intel-ucode? \n\n $a CPU microcode updates."
@@ -483,26 +489,6 @@ fs8="XFS"
}
graphics_msg() {
gr0="Auto Detect Drivers"
gr1="Vesa OpenSource Drivers"
gr2="NVIDIA Proprietary Drivers"
gr4="AMD/ATI Open Source Drivers"
gr5="Intel Open Source Drivers"
gr6="Latest stable nvidia drivers"
gr7="Legacy 340xx drivers branch"
gr8="Nvidia Open Source Drivers"
}
menu_msg() {
menu="Menu Items: \n\n $a Start a 'Command Line Session' to run custom commands\n $a Return to installer with 'anarchy'"
@@ -769,7 +755,6 @@ else
load_msg
part_msg
fs_msg
graphics_msg
menu_msg
op_msg
translate_this
View
@@ -244,11 +244,11 @@ graphics() {
ex="$?"
else
GPU=$(dialog --ok-button "$ok" --cancel-button "$cancel" --menu "$graphics_msg" 17 60 5 \
"$default" "$gr0" \
"$default" "$gr0" \
"xf86-video-ati" "$gr4" \
"xf86-video-intel" "$gr5" \
"xf86-video-nouveau" "$gr8" \
"xf86-video-vesa" "$gr1" 3>&1 1>&2 2>&3)
"xf86-video-vesa" "$gr1" 3>&1 1>&2 2>&3)
ex="$?"
fi
@@ -260,21 +260,32 @@ graphics() {
GPU=$(dialog --ok-button "$ok" --cancel-button "$cancel" --menu "$nvidia_msg" 15 60 4 \
"$gr0" "->" \
"nvidia" "$gr6" \
"nvidia-390xx" "$gr9" \
"nvidia-340xx" "$gr7" 3>&1 1>&2 2>&3)
if [ "$?" -eq "0" ]; then
if [ "$GPU" == "$gr0" ]; then
pci_id=$(lspci -nn | grep "VGA" | egrep -o '\[.*\]' | awk '{print $NF}' | sed 's/.*://;s/]//')
if (<"$aa_dir"/etc/nvidia340.xx grep "$pci_id" &>/dev/null); then
if (dialog --yes-button "$yes" --no-button "$no" --yesno "\n$nvidia_340msg" 10 60); then
if (<"$aa_dir"/etc/nvidia390.xx grep "$pci_id" &>/dev/null); then
if (dialog --yes-button "$yes" --no-button "$no" --yesno "\n$nvidia_390msg" 10 60); then
if [ "$kernel" == "lts" ]; then
GPU="nvidia-340xx-lts"
GPU="nvidia-390xx-lts"
else
GPU="nvidia-340xx"
GPU="nvidia-390xx"
fi
GPU+=" nvidia-340xx-libgl nvidia-340xx-utils nvidia-settings"
GPU+=" nvidia-390xx-libgl nvidia-390xx-utils nvidia-settings"
break
fi
elif (<"$aa_dir"/etc/nvidia340.xx grep "$pci_id" &>/dev/null); then
if (dialog --yes-button "$yes" --no-button "$no" --yesno "\n$nvidia_340msg" 10 60); then
if [ "$kernel" == "lts" ]; then
GPU="nvidia-340xx-lts"
else
GPU="nvidia-340xx"
fi
GPU+=" nvidia-340xx-libgl nvidia-340xx-utils nvidia-settings"
break
fi
elif (dialog --yes-button "$yes" --no-button "$no" --yesno "\n$nvidia_curmsg" 10 60); then
if [ "$kernel" == "lts" ]; then
GPU="nvidia-lts"

0 comments on commit 7d9cd5b

Please sign in to comment.