From 436a951537b12edd0b03c770a24fa73f2b6d5f9d Mon Sep 17 00:00:00 2001
From: Mason Rowe <mason@rowe.sh>
Date: Fri, 24 Mar 2023 01:00:35 -0400
Subject: [PATCH] skip net info if no response; fix virt detect output

---
 yabs.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/yabs.sh b/yabs.sh
index ce0a0b4..37326ea 100644
--- a/yabs.sh
+++ b/yabs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Yet Another Bench Script by Mason Rowe
-# Initial Oct 2019; Last update Feb 2023
+# Initial Oct 2019; Last update Mar 2023
 
 # Disclaimer: This project is a work in progress. Any errors or suggestions should be
 #             relayed to me via the GitHub project page linked below.
@@ -250,7 +250,7 @@ DISTRO=$(grep 'PRETTY_NAME' /etc/os-release | cut -d '"' -f 2 )
 echo -e "Distro     : $DISTRO"
 KERNEL=$(uname -r)
 echo -e "Kernel     : $KERNEL"
-VIRT=$(systemd-detect-virt)
+VIRT=$(systemd-detect-virt 2>/dev/null)
 VIRT=${VIRT^^} || VIRT="UNKNOWN"
 echo -e "VM Type    : $VIRT"
 
@@ -265,6 +265,11 @@ function ip_info() {
 
 	local response=$($DL_CMD http://ip-api.com/json/$net_ip)
 
+	# if no response, skip output
+	if [[ -z $response ]]; then
+		return
+	fi
+
 	local country=$(echo "$response" | grep -Po '"country": *\K"[^"]*"')
 	local country=${country//\"}
 
@@ -285,6 +290,10 @@ function ip_info() {
 
 	local as=$(echo "$response" | grep -Po '"as": *\K"[^"]*"')
 	local as=${as//\"}
+	
+	echo
+	echo "Basic Network Information:"
+	echo "---------------------------------"
 
 	if [[ -n "$net_type" ]]; then
 		echo "Protocol   : $net_type"
@@ -308,9 +317,6 @@ function ip_info() {
 }
 
 if [ -z $SKIP_NET ]; then
-	echo -e 
-	echo -e "Basic Network Information:"
-	echo -e "---------------------------------"
 	ip_info
 fi