README.md

@@ -1,9 +1,6 @@
 # abbiefetch
 abbiefetch is a POSIX compliant fetch script intended to be as portable as possible to run on machines of any age. abbiefetch is not dependent on any specific shell and should run fine on any system with a POSIX compliant shell and Unix utilities.
 
-## Building
-To build abbiefetch, clone this repository and run `./build.sh`. If you receive errors about `tee` having an invalid option then run `./build_alternate.sh`.
-
 ## Compatibility
 abbiefetch will attempt to gather as much information as possible on systems that don't have full compatibility and will provide you with a system type (and sometimes a subtype) to let you know what abbiefetch thinks your computer is running.
 
@@ -11,15 +8,12 @@ abbiefetch will attempt to gather as much information as possible on systems tha
 | - | - | - | - | - | - |
 | `unknown` | Unknown kernel | | | None | Default when your system is unrecognised |
 | `linux` | Linux | | 1.0.0 | Full | |
-| `linux/android` | Linux | Android | `master` | Full | |
 | `linux/chumby` | Linux | Chumby internet appliances | 1.0.0 | Full | Uses chumby specific tools. |
 | `linux/proxmox` | Linux | Proxmox VE host | 1.0.0 | Full | |
-| `linux/rpi` | Linux | Raspberry Pi single board computer | 1.0.0 | Partial | Currently there are issues detecting the host machine and CPU. |
+| `linux/rpi` | Linux | Raspberry Pi single board computer | 1.0.0 | Limited | Currently there are issues detecting the host machine and CPU. |
 | `openbsd` | OpenBSD | | 1.0.0 | Full | |
 | `netbsd` | NetBSD | | 1.1.0 | Full | | 
 | `freebsd` | FreeBSD | | 1.1.0 | Full | |
-| `freebsd/dfly` | FreeBSD | DragonFly BSD | `master` | Full | DragonFly is a fork of FreeBSD which is similar enough that no modifications need be made. |
+| `haiku` | Haiku | | 1.1.0 | Limited | |
-| `haiku` | Haiku | | 1.1.0 | Partial | |
 | `windows` | Microsoft Windows | | 1.2.0 | Full | Relies on wmic.exe and systeminfo.exe |
-| `windows/cygwin` | Microsoft Windows | Cygwin | 1.2.0 | Partial | Relies on wmic.exe and systeminfo.exe, issues with machine detection |
+| `windows/cygwin` | Microsoft Windows | Cygwin | 1.2.0 | Full | Relies on wmic.exe and systeminfo.exe |
-| `illumos` | illumos | | `master` | Partial | |

build_alternate.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-cat probing.1 | tee abbiefetch
-cat system_detection.2 | tee -a abbiefetch
-cat hostname_username.3 | tee -a abbiefetch
-cat processor_detection.4 | tee -a abbiefetch
-cat kernel_info.5 | tee -a abbiefetch
-cat gpu_detection.6 | tee -a abbiefetch
-cat distro_machine_detection.7 | tee -a abbiefetch
-cat display_results.8 | tee -a abbiefetch
-chmod +x abbiefetch

display_results.8

@@ -14,11 +14,7 @@ if [ -n "$kernel" ]; then
 	echo "krn: $kernel"
 fi
 if [ -n "$distro" ]; then
-	if [ "$system_type" = "windows" ]; then
-		echo "sys:$distro"
-	else
 	echo "sys: $distro"
-	fi
 fi
 if [ -n "$machine" ]; then
 	echo "mac: $machine"

distro_machine_detection.7

@@ -37,15 +37,6 @@ if [ "$subtype" = "proxmox" ]; then
 		fi
 	fi
 fi
-if [ "$subtype" = "android" ]; then
-	if [ -n "$(getprop ro.product.manufacturer)$(getprop ro.product.model)" ]; then
-		machine="$(getprop ro.product.manufacturer) $(getprop ro.product.model)"
-	fi
-	if [ -n "$(getprop ro.build.version.release)" ]; then
-		distro="Android $(getprop ro.build.version.release)"
-	fi
-fi
-
 if [ "$system_type" = "openbsd" ]; then
 	if [ "$hasawk" -eq 1 ]; then
 		distro="revision $(sysctl kern.osrevision | awk -F "=" '{print $2}')"
@@ -81,9 +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
-	if [ "$subtype" = "cygwin" ]; then
+	machine="$(wmic.exe computersystem get Manufacturer,Model | sed -n 2p | head -n 1)"
-		machine=0
-	else
-		machine="$(wmic.exe computersystem get Manufacturer | sed -n 2p | head -n 1 | tr -s " ")$(wmic.exe computersystem get Model | sed -n 2p | head -n 1)"
-	fi
 fi

kernel_info.5

@@ -4,6 +4,3 @@ fi
 if [ -n "$(uname -s)" ] && [ -z "$kernel" ]; then
 	kernel="$(uname -s)"
 fi
-if [ "$system_type" = "illumos" ]; then
-	kernel="$(uname -v)"
-fi

processor_detection.4

@@ -28,18 +28,6 @@ if [ "$hassed" -eq 1 ] && [ "$system_type" = "windows" ] && [ -z "$processor" ];
 		processor="$(wmic.exe cpu get name | sed -n 2p | head -n 1)"
 	fi
 fi
-if [ "$subtype" = "android" ]; then
-	if [ -n "$(getprop ro.soc.manufacturer)$(getprop ro.soc.model)" ]; then
-		processor="$(getprop ro.soc.manufacturer) $(getprop ro.soc.model)"
-	elif [ -n "$(getprop ro.hardware.chipname)" ]; then
-		processor="$(getprop ro.hardware.chipname)"
-	fi
-fi
-if [ "$hasawk" -eq 1 ] && [ "$system_type" = "illumos" ] && [ -z "$processor" ]; then
-	if [ -n "$(kstat | grep brand)" ]; then
-		processor="$(kstat | grep brand | head -n 1 | tr -s " " | awk -F "brand " '{print $2}')"
-	fi
-fi
 if [ "$hassed" -eq 1 ] && [ "$hasawk" -eq 1 ] && [ -n "$processor" ]; then
 	if [ -n "$(echo $processor | awk -F "@" '{print $1}' | sed "s/Processor//g" | sed "s/CPU//g" | sed "s/(R)//g" | sed "s/(r)//g" | sed "s/(TM)//g" | sed "s/(tm)//g" | tr -s " ")" ]; then
 		processor="$(echo $processor | awk -F "@" '{print $1}' | sed "s/Processor//g" | sed "s/CPU//g" | sed "s/(R)//g" | sed "s/(r)//g" | sed "s/(TM)//g" | sed "s/(tm)//g" | tr -s " ")"

system_detection.2

@@ -12,11 +12,6 @@ if [ "$(uname -s)" = "Linux" ] && [ "$system_type" = "unknown" ]; then
 	if [ "$?" -eq 0 ] && [ "$subtype" = "none" ]; then
 		subtype="proxmox"
 	fi
-	command -v getprop >>/dev/null
-	if [ "$?" -eq 0 ] && [ "$subtype" = "none" ]; then
-		subtype="android"
-		haslspci=0
-	fi
 fi
 if [ "$(uname -s)" = "OpenBSD" ] && [ "$system_type" = "unknown" ]; then
 	system_type="openbsd"
@@ -24,10 +19,6 @@ fi
 if [ "$(uname -s)" = "FreeBSD" ] && [ "$system_type" = "unknown" ]; then
 	system_type="freebsd"
 fi
-if [ "$(uname -s)" = "DragonFly" ] && [ "$system_type" = "unknown" ]; then
-	system_type="freebsd"
-	subtype="dfly"
-fi
 if [ "$(uname -s)" = "NetBSD" ] && [ "$system_type" = "unknown" ]; then
 	system_type="netbsd"
 fi
@@ -41,6 +32,3 @@ if [ "$?" -eq 0 ] && [ "$system_type" = "unknown" ]; then
 		subtype="cygwin"
 	fi
 fi
-if [ "$(uname -o)" = "illumos" ] && [ "$system_type" = "unknown" ]; then
-	system_type="illumos"
-fi