config

commit ded64053f5b37ce610dbca87a2116cce43c3b468
parent 68be897987d44424b9b11b8f380c9e3c2465c8ba
Author: Jacob R. Edwards <jacobouno@protonmail.com>
Date:   Wed, 18 Nov 2020 21:05:17 -0800

Rework shell module files

Move `util' include and reload functions to main and remove verb,
warn, and err and all includes placed at the bottom.

Diffstat:
M
modules/aliases/.config/aliases/main
 | 
25
+++++++++++++++----------
D
modules/aliases/.config/aliases/util
 | 
29
-----------------------------

2 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/modules/aliases/.config/aliases/main b/modules/aliases/.config/aliases/main
@@ -1,21 +1,18 @@
 # shell aliases and functions
 
-. $ALIASES/util
-
-include cd
-include complex
-include git
-include history
-include mpc
-include openbsd
-include private
-include xorg
+# include shell module.
+include() {
+	local include="${ALIASES:?unset}/$1"
+	test -f "$include" || { printf "%s: include: \'%s\': File nonexistent.\n" `basename $0` $include; return 1 ;}
+	. "$include"
+}
 
 doin() { (builtin cd ${1:?No directory} && shift && eval $@) ;}
 fed() { doin "$FEED_DIR" feed $@ ;}
 fman() { groff -man -Tascii $@ | l ;}
 note() { doin $HOME/own/text/note/ $@ ;}
 np() { unset ALL_PROXY; unset HTTP_PROXY ;}
+reload() { . ~/.profile && include main ;}
 vol() { sndioctl output.level=$@ ;}
 
 alias ap="apropos"
@@ -39,4 +36,12 @@ alias f="$EDITOR"
 alias l="$PAGER"
 alias t="tmux"
 
+include cd
+include complex
+include git
+include history
 include locate
+include mpc
+include openbsd
+include private
+include xorg
diff --git a/modules/aliases/.config/aliases/util b/modules/aliases/.config/aliases/util
@@ -1,29 +0,0 @@
-# utility shell aliases and functions
-
-verb() {
-	echo "$@" 1>&2
-}
-
-warn() {
-	verb "$0: ${@?warn: No message given}"
-}
-
-# err(status, [message])
-err() { 
-	local status=${1:?No exit status.}; shift
-	warn "${@:-undefined error}"
-	exit $status 
-}
-
-# include an alias module, does not halt processing non-existent file like `.'.
-include() {
-	local include="${ALIASES:?unset}/$1"
-	test -f "$include" || { warn "'$include': File non-existent."; return 1 ;}
-	. "$include"
-}
-
-# reload shell
-reload() {
-	. ~/.profile
-	include main
-}