Upload files to "/"

gfxb

@@ -10,18 +10,22 @@ clear
 sudo rm -rf ./.tmp/"$uid".log
 #sudo rm -rf ./.tmp/
 mkdir ./.tmp/
-gpu=$(sudo inxi -Gxxxa | grep -i 'device-1: ' | grep -i 'vendor: ' | awk -F': ' '{print $2}' | sed s/vendor//g | sed 's/^[ \t]*//')
-gpuven=$(sudo inxi -Gxxxa | grep -i 'device-1:' | grep -i 'vendor:' | awk -F'vendor:' '{print $2}' | awk -F' driver:' '{print $1}' | sed 's/^[ \t]*//')
-gpu2=$(sudo inxi -Gxxxa | grep -i 'device-2: ' | grep -i 'vendor: ' | awk -F': ' '{print $2}' | sed s/vendor//g | sed 's/^[ \t]*//')
-gpuven2=$(sudo inxi -Gxxxa | grep -i 'device-2:' | grep -i 'vendor:' | awk -F'vendor:' '{print $2}' | awk -F' driver:' '{print $1}' | sed 's/^[ \t]*//')
+#gpu=$(sudo lshw -c display | grep -m 1 -i 'product: ' | awk -F 'product: ' '{print $2}' | sed 's/^[ \t]*//')
+gpu=$(sudo inxi -Gxxxa | grep -m1 -i 'device' | awk -F': ' '{print $2}' | awk -F': ' '{print $1}'  | sed s/driver//g | sed s/vendor//g | sed 's/^[ \t]*//' | tail -n1)
+#gpuven=$(sudo lshw -c display | grep -m 1 -i 'vendor: ' | awk -F 'vendor: ' '{print $2}' | sed 's/^[ \t]*//')
+gpuven=$(sudo inxi -Gxxxa | grep -m1 -i 'vendor: ' | awk -F'vendor: ' '{print $2}' | awk -F': ' '{print $1}' | sed s/driver//g | sed s/vendor//g | sed 's/^[ \t]*//' | tail -n1)
+gpu2=$(sudo inxi -Gxxxa | grep -m2 -i 'device' | awk -F': ' '{print $2}' | awk -F': ' '{print $1}'  | sed s/driver//g | sed s/vendor//g | sed 's/^[ \t]*//' | tail -n1)
+gpuven2=$(sudo inxi -Gxxxa | grep -m2 -i 'vendor: ' | awk -F'vendor: ' '{print $2}' | awk -F': ' '{print $1}' | sed s/driver//g | sed s/vendor//g | sed 's/^[ \t]*//' | tail -n1)
 vram=$(sudo inxi -Gxxxa | grep -i 'Memory:' | awk -F'memory:' '{print $2}' | awk -F' ' '{print $1,$2}' | sed s/GiB/GB/g | awk '{printf "%.0fGB\n", $1}')
 clear
 echo "================================================================================" | tee -a ./.tmp/"$uid".log
 echo " GFX BENCHMARK  UID: $uid  DATE: ${ts}" | tee -a ./.tmp/"$uid".log
 echo "================================================================================" | tee -a ./.tmp/"$uid".log
-echo "    GPU: $gpuven $gpu" | tee -a ./.tmp/"$uid".log
+echo "    GPU: $gpu" | tee -a ./.tmp/"$uid".log
+echo " VENDOR: $gpuven" | tee -a ./.tmp/"$uid".log
 echo "--------------------------------------------------------------------------------" | tee -a ./.tmp/"$uid".log
-echo "   GPU2: $gpuven2 $gpu2" | tee -a ./.tmp/"$uid".log
+echo "   GPU2: $gpu2" | tee -a ./.tmp/"$uid".log
+echo " VENDOR: $gpuven2" | tee -a ./.tmp/"$uid".log
 echo "--------------------------------------------------------------------------------" | tee -a ./.tmp/"$uid".log
 echo "   VRAM: $vram" | tee -a ./.tmp/"$uid".log
 echo "================================================================================" | tee -a ./.tmp/"$uid".log