From 57d14905bc4377f3c7e26e46f1cc979b0e6ddaec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 22 Dec 2016 11:17:02 +1100 Subject: [PATCH] GPU: Print each GPU on a different line --- neofetch | 69 +++++++++++++++++++++++++++++++++----------------------- 1 file changed, 41 insertions(+), 28 deletions(-) diff --git a/neofetch b/neofetch index 56d80d18..1bcacd16 100755 --- a/neofetch +++ b/neofetch @@ -965,35 +965,48 @@ get_cpu_usage() { get_gpu() { case "$os" in "Linux") - gpu="$(lspci -mm | awk -F '\\"|\\" \\"' '/"Display|"3D|"VGA/ {print $3 " " $4}')" + IFS=$'\n' + gpus=($(lspci -mm | awk -F '\\"|\\" \\"' '/"Display|"3D|"VGA/ {print $3 " " $4}')) - case "$gpu" in - *"advanced"*) - gpu="${gpu//Intel*$'\n'}" - gpu="${gpu/'[AMD/ATI]' }" - gpu="${gpu/'[AMD]' }" - gpu="${gpu/OEM }" - gpu="${gpu/Advanced Micro Devices, Inc.}" - gpu="${gpu/ \/ *}" - gpu="${gpu/*\[}" - gpu="${gpu/\]*}" - gpu="AMD $gpu" - ;; + for gpu in "${gpus[@]}"; do + case "$gpu" in + *"advanced"*) + gpu="${gpu/'[AMD/ATI]' }" + gpu="${gpu/'[AMD]' }" + gpu="${gpu/OEM }" + gpu="${gpu/Advanced Micro Devices, Inc.}" + gpu="${gpu/ \/ *}" + gpu="${gpu/*\[}" + gpu="${gpu/\]*}" + gpu="AMD $gpu" + ;; - *"nvidia"*) - gpu="${gpu//Intel*$'\n'}" - gpu="${gpu/*\[}" - gpu="${gpu/\]*}" - gpu="NVIDIA $gpu" - ;; + *"nvidia"*) + gpu="${gpu/*\[}" + gpu="${gpu/\]*}" + gpu="NVIDIA $gpu" + ;; - *"virtualbox"*) - gpu="VirtualBox Graphics Adapter" - ;; - esac + *"intel"*) + gpu="Intel Integrated Graphics" + ;; - [[ "$gpu" == *"intel"* ]] && \ - gpu="Intel Integrated Graphics" + *"virtualbox"*) + gpu="VirtualBox Graphics Adapter" + ;; + esac + + if [[ "$gpu_brand" == "off" ]]; then + gpu="${gpu//AMD }" + gpu="${gpu//NVIDIA }" + gpu="${gpu//Intel }" + fi + + prin "GPU${index:-0}" "$gpu" + index="$((index+=1))" + done + + return ;; "Mac OS X") @@ -1067,9 +1080,9 @@ get_gpu() { esac if [[ "$gpu_brand" == "off" ]]; then - gpu="${gpu/AMD}" - gpu="${gpu/NVIDIA}" - gpu="${gpu/Intel}" + gpu="${gpu//AMD}" + gpu="${gpu//NVIDIA}" + gpu="${gpu//Intel}" fi }