Shorten CPU name and remove dir from wm

Add nixpkgs package to readme

LICENSE

@@ -1,19 +1,13 @@
-Copyright (c) 2020 Gauge Krahe
+Copyright 2020 Gauge Krahe
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
+Permission to use, copy, modify, and/or distribute this software for any
-of this software and associated documentation files (the "Software"), to deal
+purpose with or without fee is hereby granted, provided that the above
-in the Software without restriction, including without limitation the rights
+copyright notice and this permission notice appear in all copies.
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-copies or substantial portions of the Software.
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,8 +1,22 @@
-<h2 align="center">fet.sh</h1>
-
-
 <div align="center">
+<h1>fet.sh</h1>
 fetch written in POSIX shell with no external commands
 <br>
 <img src="screenshot.png" width="250px">
 </div>
+
+### Installing
+**Arch:** [fet.sh-git](https://aur.archlinux.org/packages/fet.sh-git/) (AUR)  
+**Nix:** [fet-sh](https://search.nixos.org/packages?show=fet-sh&query=fet-sh&channel=unstable) (nixpkgs-unstable)  
+**Gentoo:** [app-misc/fetsh](https://gpo.zugaina.org/Overlays/guru/app-misc/fetsh) (GURU overlay)  
+**Other Distros:** copy `fet.sh` to somewhere in $PATH
+
+### Customization
+`fet.sh` can be configured using environment variables, for example:
+```
+$ info='n os wm sh n' fet.sh
+```
+Supported options are:
+- `accent` (0-7)
+- `info`
+- `separator`

fet.sh

@@ -1,66 +1,212 @@
 #!/bin/sh
 #
-#  this is my attempt at trying to make a fetch using only posix shell
+#    fet.sh
-#   without any external commands
+#  a fetch in pure POSIX shell
 #
 
 # supress errors
 exec 2>/dev/null
 set --
+eq() {  # equals  |  [ a = b ] with globbing
+	case $1 in
+		# if the second argument matches the first, exit normally
+		$2) return
+		# if it doesn't match, reverse the output of `:`, which makes an error
+	esac;! :
+}
 
-## Terminal
+## DE
-while [ ! "$term" ]; do
+wm="$XDG_CURRENT_DESKTOP"
-	while IFS=':	' read -r key val; do
+wm="$DESKTOP_SESSION"
-		case $key in
-			PPid) ppid=$val; break;;
-		esac
-	done < "/proc/${ppid:-$PPID}/status"
 
-	read -r name < "/proc/$ppid/comm"
+## Distro
-	case $name in
+# freedesktop.org/software/systemd/man/os-release.html
-		*sh) ;;
+# a common file that has variables about the distro
-		"${0##*/}") ;;
+for os in /etc/os-release /usr/lib/os-release; do
-		*[Ll]ogin*|*init*) term=linux;;
+	# some POSIX shells exit when trying to source a file that doesn't exist
-		*) term="$name";;
+	[ -f $os ] && . $os && break
-	esac
 done
 
-## WM/DE
+if [ -e /proc/$$/comm ]; then
-if [ "$XDG_CURRENT_DESKTOP" ]; then
+	## Terminal
-	wm="$XDG_CURRENT_DESKTOP"
+	while [ ! "$term" ]; do
-elif [ "$DESKTOP_SESSION" ]; then
+		# loop over lines in /proc/pid/status until it reaches PPid
-	wm="$DESKTOP_SESSION"
+		# then save that to a variable and exit the file
-elif [ "$DISPLAY" ]; then
+		while read -r line; do
+			eq "$line" "PPid*" && ppid=${line##*:?} && break
+		done < "/proc/${ppid:-$PPID}/status"
+
+		# get name of binary
+		read -r name < "/proc/$ppid/comm"
+		case $name in
+			*sh|"${0##*/}") ;;  # skip shells
+			*[Ll]ogin*|*init*) break;;  # exit when the top is reached
+			*) term="$name"  # anything else can be assumed to be the terminal
+		esac
+	done
+
+	## WM/DE
+	# standard variables, mostly used for DEs
+	[ "$DISPLAY" ] && [ ! "$wm" ] &&
+		# non-standard WMs
+		# loop over all processes and check the binary name
 		for i in /proc/*/comm; do
 			read -r c < "$i"
 			case $c in
-			awesome|xmonad|qtile|i3*|*box*|*wm*) wm="$c"; break;;
+				awesome|xmonad*|qtile|sway|i3|*box*|*wm*) wm="${c%%-*}"; break;;
 			esac
 		done
-fi
 
-## Distro
+	## Memory
-. /etc/os-release   # lol EZ
+	# loop over lines in /proc/meminfo until it reaches MemTotal,
+	# then convert the amount (second word) from KB to MB
+	while read -r line; do
+		eq "$line" "MemTotal*" && set -- $line && break
+	done < /proc/meminfo
+	mem="$(( $2 / 1000 ))MB"
 
-## Memory
+	## Processor
-while read -r line; do
+	while read -r line; do
 		case $line in
-		MemTotal*) mem="${line##*: }"; break;;
+			vendor_id*) vendor="${line##*: } ";;
-	esac
-done < /proc/meminfo
-mem="${mem##*  }"
-mem="$(( ${mem%% *} / 1000 ))"
-
-## Processor
-while read -r line; do
-	case $line in
-		vendor_id*) vendor="${line##*: }";;
 			model\ name*) cpu="${line##*: }"; break;;
 		esac
-done < /proc/cpuinfo
+	done < /proc/cpuinfo
+
+	## Uptime
+	# the simple math is shamefully stolen from aosync
+	IFS=. read -r uptime _ < /proc/uptime
+	d=$((uptime / 60 / 60 / 24))
+	up=$(printf %02d:%02d $((uptime / 60 / 60 % 24)) $((uptime / 60 % 60)))
+	[ "$d" -gt 0 ] && up="${d}d $up"
+
+	## Kernel
+	read -r _ _ version _ < /proc/version
+	kernel="${version%%-*}"
+	eq "$version" "*Microsoft*" && ID="fake $ID"
+
+	## Motherboard // laptop
+	read -r model < /sys/devices/virtual/dmi/id/product_name
+
+	## Packages
+	# clean environment, then make every file in the dir an argument,
+	# then save the argument count to $pkgs
+	set --
+	[ -d /var/db/kiss/installed ] && set -- /var/db/kiss/installed/*
+	[ -d /var/lib/pacman/local  ] && set -- /var/lib/pacman/local/[0-9a-z]*
+	[ -d /var/db/xbps ] && set -- /var/db/xbps/.*
+	[ -d /var/db/pkg  ] && set -- /var/db/pkg/*/*  # gentoo
+	pkgs=${###0}
+
+	read -r host < /proc/sys/kernel/hostname
+elif [ -f /var/run/dmesg.boot ]; then
+	# Both OpenBSD and FreeBSD use this file, however they're formatted differently
+	read -r bsd < /var/run/dmesg.boot
+	case $bsd in
+	Open*)
+		## OpenBSD cpu/mem/name
+		while read -r line; do
+			case $line in
+				"real mem"*)
+					# use the pre-formatted value which is in brackets
+					mem=${line##*\(}
+					mem=${mem%\)*}
+				;;
+				# set $cpu to everything before a comma and after the field name
+				cpu0:*)
+					cpu=${line#cpu0: }
+					# Remove excess info after the actual CPU name
+					cpu=${cpu%%,*}
+					# Set the CPU Manufacturer to the first word of the cpu
+					# variable [separated by '(' or ' ']
+					vendor=${cpu%%[\( ]*}
+					# We got all the info we want, stop reading
+					break
+				;;
+				# First 2 words in the file are OpenBSD <version>
+				*) [ "$ID" ] || { set -- $line; ID="$1 $2"; }
+			esac
+		done < /var/run/dmesg.boot
+		[ -d /var/db/pkg ] && set -- /var/db/pkg/* && pkgs=$#
+		read -r host < /etc/myname
+		host=${host%.*}
+	;;
+	# Everything else, assume FreeBSD (first line is ---<<BOOT>> or something)
+	*)
+		# shellcheck source=/dev/null
+		. /etc/rc.conf
+		# shut shellcheck up without disabling the warning
+		host=${hostname:-}
+
+		while read -r line; do
+			case $line in
+				# Ignore useless lines at the top
+				-*|'  '*) ;;
+				*trademark*) ;;
+
+				# os version
+				FreeBSD*)
+					# If the OS is already set, no need to set it again
+					[ "$ID" ] && continue
+					ID="${line%%-R*}"
+				;;
+
+				CPU:*)
+					cpu=${cpu#CPU: }
+					# Remove excess info from after the actual CPU name
+					cpu=${line%\(*}
+				;;
+				*Origin=*)
+					# CPU Manufacturer
+					vendor=${line#*Origin=\"}
+					vendor="${vendor%%\"*} "
+				;;
+
+				"real memory"*)
+					# Get the pre-formatted amount which is inside brackets
+					mem=${line##*\(}
+					mem=${mem%\)*}
+					# This appears to be the final thing we need from the file,
+					# no need to read it more.
+					break
+			esac
+		done < /var/run/dmesg.boot
+	;;
+	esac
+elif v=/System/Library/CoreServices/SystemVersion.plist; [ -f "$v" ]; then
+	## Macos
+	# make sure this variable is empty as to not break the following loop
+	temp=
+	while read -r line; do
+		case $line in
+			# set a variable so the script knows it's on the correct line
+			# (the line after this one is the important one)
+			*ProductVersion*) temp=.;;
+			*)
+				# check if the script is reading the derired line, if not
+				# don't do anything
+				[ "$temp" ] || continue
+				# Remove everything before and including the first '>'
+				ID=${line#*>}
+				# Remove the other side of the XML tag, and insert the actual OS name
+				ID="MacOS ${ID%<*}"
+				# We got the info we want, end the loop.
+				break
+		esac
+	done < "$v"
+fi
+
+eq "$0" "*fetish" && printf 'Step on me daddy\n' && exit
+
+## GTK
+while read -r line; do
+	eq "$line" "gtk-theme*" && gtk="${line##*=}" && break
+done < "${XDG_CONFIG_HOME:=$HOME/.config}/gtk-3.0/settings.ini"
+
+# Shorten $cpu and $vendor
+# this is so messy due to so many inconsistencies in the model names
 vendor="${vendor##*Authentic}"
 vendor="${vendor##*Genuine}"
-# This is so messy due to so many inconsistencies in the model names
 cpu="${cpu##*) }"
 cpu="${cpu%% @*}"
 cpu="${cpu%% CPU}"
@@ -69,59 +215,37 @@ cpu="${cpu##*AMD }"
 cpu="${cpu%% with*}"
 cpu="${cpu% *-Core*}"
 
-## Uptime
+col() {
-# the simple math is shamefully stolen from aosync
+	printf '  '
-IFS=. read -r uptime _ < /proc/uptime
+	for i in 1 2 3 4 5 6; do
-d=$((uptime / 60 / 60 / 24))
+		printf '\033[9%sm▅▅' "$i"
-up=$(printf %02d:%02d $((uptime / 60 / 60 % 24)) $((uptime / 60 % 60)))
+	done
-[ "$d" -gt 0 ] && up="${d}d $up"
+	printf '\033[0m\n'
-
-## Kernel
-read -r _ _ version _ < /proc/version
-kernel="${version%%-*}"
-case $version in
-	*Microsoft*) [ "$ID" ] && ID="fake $ID";;
-esac
-
-## GTK
-while read -r line; do
-	case $line in
-		gtk-theme*) gtk="${line##*=}"; break;;
-	esac
-done < "${XDG_CONFIG_HOME:-$HOME/.config}"/gtk-3.0/settings.ini
-
-## Motherboard // laptop
-read -r model < /sys/devices/virtual/dmi/id/product_name
-
-## Packages
-[ -d /var/lib/pacman/local ] && set -- /var/lib/pacman/local/*
-[ -d /var/db/xbps ] && set -- /var/db/xbps/.*
-[ -d /var/db/pkg ] && set -- /var/db/pkg/*/*
-[ $# -gt 0 ] && pkgs=$#
-
-print() {
-	[ "$2" ] && printf '\033[34m%6s\033[0m ~ %s\n' "$1" "$2"
 }
 
+print() {
+	[ "$2" ] && printf '\033[9%sm%6s\033[0m%b%s\n' \
+		"${accent:-4}" "$1" "${separator:- ~ }" "$2"
+}
 
-echo
+# default value
-read -r host < /etc/hostname
+: "${info:=n user os sh wm up gtk cpu mem host kern pkgs term col n}"
-printf '%7s@%s\n' "$USER" "$host"
 
-print os "$ID"
+for i in $info; do
-print sh "${SHELL##*/}"
+	case $i in
-print wm "$wm"
+		n) echo;;
-print up "$up"
+		os) print os "$ID";;
-print gtk "${gtk# }"
+		sh) print sh "${SHELL##*/}";;
-print cpu "$vendor $cpu"
+		wm) print wm "${wm##*/}";;
-print mem "${mem}MB"
+		up) print up "$up";;
-print host "$model"
+		gtk) print gtk "${gtk# }";;
-print kern "$kernel"
+		cpu) print cpu "$vendor$cpu";;
-print pkgs "$pkgs"
+		mem) print mem "$mem";;
-print term "$term"
+		host) print host "$model";;
-
+		kern) print kern "$kernel";;
-printf '  '
+		pkgs) print pkgs "$pkgs";;
-for i in 1 2 3 4 5 6; do
+		term) print term "$term";;
-	printf '\033[9%sm▅▅' "$i"
+		user) printf '%7s@%s\n' "$USER" "$host";;
+		col) col;;
+	esac
 done
-printf '\033[0m\n\n'