A few more tweaks to my ksh configuration

1 files changed, 34 insertions, 26 deletions

diff --git a/kshrc b/kshrc
index 93b5480..48504f2 100644
--- a/kshrc
+++ b/kshrc
@@ -28,7 +28,7 @@ setaliases() {
 	alias rot13="tr 'A-Za-z' 'N-ZA-Mn-za-m'"
 	alias setxkbmap-list="man xkeyboard-config"
 	showsshhosts() {
-		cat ~/.ssh/config ~/.ssh/inc/* | awk '/^[hH]ost /{$1=""; print $0}'
+		cat ~/.ssh/config ~/.ssh/inc/* 2>/dev/null | awk '/^[hH]ost /{$1=""; print $0}'
 	}
 	# docker-getip $container_id
 	alias docker-getip="docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'"
@@ -106,32 +106,35 @@ setcoloraliases() {
 
 setsudoaliases() {
 	# Prefer doas if available, as it's likely to be configured by me over sudo
-	_sudo="$(command -v doas sudo 2>/dev/null | sed 1q)"
+	_sudo="$(command -v sudo 2>/dev/null | sed 1q)"
+	_doas="$(command -v doas 2>/dev/null | sed 1q)"
+	if [ -n "$_doas" ] ; then
+		_sudo="$_doas"
+	fi
+
+	_cmds="apt-get
+apt-file
+yum
+dnf
+pacman
+xbps-install
+xbps-remove
+pkg_add
+pkg_delete
+pkg
+tlp
+tlp-stat
+zfs
+zpool
+btrfs
+mount
+umount"
+
+	# Only add aliases for commands that actually exist on our system
 	if [ -x "$_sudo" ] ; then
-	# Package managers
-	# Isn't it amazing how many distros you end up using?
-	alias apt-get="$_sudo apt-get"
-	alias apk="$_sudo apk"
-	alias apt="$_sudo apt"
-	alias apt-file="$_sudo apt-file"
-	alias yum="$_sudo yum"
-	alias dnf="$_sudo dnf"
-	alias pacman="$_sudo pacman"
-	alias xbps-install="$_sudo xbps-install"
-	alias xbps-remove="$_sudo xbps-remove"
-	alias pkg="$_sudo pkg"
-	alias pkg_add="$_sudo pkg_add"
-
-	# Linux power utilities
-	alias tlp='$_sudo tlp'
-	alias tlp-stat='$_sudo tlp-stat'
-
-	# Filesystem utilities
-	alias zfs="$_sudo zfs"
-	alias zpool="$_sudo zpool"
-	alias btrfs="$_sudo btrfs"
-	alias mount="$_sudo mount"
-	alias umount="$_sudo umount"
+		for _c in $_cmds ; do
+			[ -x "$(command -v "$_c")" ] && eval "alias $_c=\"$_sudo $_c\""
+		done
 	fi
 	case $_sudo in
 		*doas*) alias sudo='doas'; ;;
@@ -155,9 +158,13 @@ set_go() {
 _set_editor() {
 	export EDITOR="$1"
 	export VISUAL="$1"
+	#shellcheck disable=SC2139
 	alias vi="$EDITOR"
+	#shellcheck disable=SC2139
 	alias vim="$EDITOR"
+	#shellcheck disable=SC2139
 	alias edit="$EDITOR"
+	#shellcheck disable=SC2139
 	alias e="$EDITOR"
 }
 set_editor() {
@@ -278,6 +285,7 @@ checkSSHAgent() {
 }
 
 checkSSHAgentGPG() {
+	#shellcheck disable=SC2155
 	export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
 }