diff --git a/spg b/spg index 96f56b5..649389f 100644 --- a/spg +++ b/spg @@ -21,11 +21,9 @@ uid=$(sudo cat /sys/class/dmi/id/product_uuid) tag=$(sudo cat /sys/class/dmi/id/chassis_asset_tag) cpu=$(sudo lshw -short | grep 'processor' | awk -F 'processor' '{print $2}' | sed 's/^[ \t]*//') #gpu=$(sudo lshw -short | grep -i 'display' | awk -F 'display' '{print $2}' | sed 's/^[ \t]*//') -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]*//') -vram=$(sudo inxi -Gxxxa | grep -i 'Memory:' | awk -F'memory:' '{print $2}' | awk -F' ' '{print $1,$2}' | sed s/GiB/GB/g) +gpu=$(sudo inxi -Gxxxa | grep -i 'vendor:' | grep -i 'driver:'| awk -F': ' '{print $2}' | sed s/vendor//g) +gpuven=$(sudo inxi -Gxxxa | grep -i 'vendor:' | grep -i 'driver:' | awk -F'vendor:' '{print $2}' | awk -F' driver:' '{print $1}' | sed 's/^[ \t]*//') +vram=$(sudo inxi -Gxxxa | grep -i 'Memory:' | awk -F'memory:' '{print $2}' | awk -F' ' '{print $1,$2}' | sed s/GiB/GB/g | awk '{printf "%.0f GB\n", $1}') ram=$(sudo lshw -short | grep -i 'system memory' | awk -F ' ' '{print $3}' | sed 's/^[ \t]*//' | sed s/GiB/' GB'/g) drv=$(sudo lsblk -o NAME,TYPE,VENDOR,MODEL,SIZE,SERIAL -e 7 | grep -v '^[[:space:]]*MODEL' | grep '[^ ]') sudo rm -rf ./.tmp/"$sn".log @@ -54,13 +52,11 @@ echo " TAG: $tag" | tee -a ./.tmp/"$sn".log echo "--------------------------------------------------------------------------------" | tee -a ./.tmp/"$sn".log echo " CPU: $cpu" | tee -a ./.tmp/"$sn".log echo "--------------------------------------------------------------------------------" | tee -a ./.tmp/"$sn".log -echo " RAM: $ram" | tee -a ./.tmp/"$sn".log -echo "--------------------------------------------------------------------------------" | tee -a ./.tmp/"$sn".log echo " GPU: $gpuven $gpu" | tee -a ./.tmp/"$sn".log echo "--------------------------------------------------------------------------------" | tee -a ./.tmp/"$sn".log -echo " GPU2: $gpuven2 $gpu2" | tee -a ./.tmp/"$sn".log -echo "--------------------------------------------------------------------------------" | tee -a ./.tmp/"$sn".log echo " VRAM: $vram" | tee -a ./.tmp/"$sn".log +echo "--------------------------------------------------------------------------------" | tee -a ./.tmp/"$sn".log +echo " RAM: $ram" | tee -a ./.tmp/"$sn".log echo "================================================================================" | tee -a ./.tmp/"$sn".log echo " DRIVES: " | tee -a ./.tmp/"$sn".log echo "--------------------------------------------------------------------------------" | tee -a ./.tmp/"$sn".log