diff --git a/display_results.8 b/display_results.8 index 92d3775..01a79d1 100644 --- a/display_results.8 +++ b/display_results.8 @@ -14,7 +14,11 @@ if [ -n "$kernel" ]; then echo "krn: $kernel" fi if [ -n "$distro" ]; then - echo "sys: $distro" + if [ "$system_type" = "windows" ]; then + echo "sys:$distro" + else + echo "sys: $distro" + fi fi if [ -n "$machine" ]; then echo "mac: $machine" diff --git a/distro_machine_detection.7 b/distro_machine_detection.7 index 3d8ac3b..9446633 100644 --- a/distro_machine_detection.7 +++ b/distro_machine_detection.7 @@ -72,5 +72,5 @@ if [ "$system_type" = "windows" ] && [ -z "$machine"] && [ "$hassed" -eq 1 ]; th if [ "$hasawk" -eq 1 ]; then distro="$(systeminfo.exe 2>/dev/null | grep -v "BIOS" | grep "OS Version" | awk -F ":" '{print $2}' | tr -s " ")" fi - machine="$(wmic.exe computersystem get Manufacturer,Model | sed -n 2p | head -n 1)" + machine="$(wmic.exe computersystem get Manufacturer | sed -n 2p | head -n 1 | tr -s " ")$(wmic.exe computersystem get Manufacturer | sed -n 2p | head -n 1)" fi