From a0188f38d8a9702dd3d7119375173d063a5f28bc Mon Sep 17 00:00:00 2001 From: EuAndreh Date: Sat, 13 Aug 2022 10:58:10 -0300 Subject: bin/: Replace usage of assert_arg with assert-arg --- bin/msg | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'bin/msg') diff --git a/bin/msg b/bin/msg index ad0b608..f685ffb 100755 --- a/bin/msg +++ b/bin/msg @@ -124,31 +124,23 @@ fi MESSAGE="${1:-}" -assert_arg() { - if [ -z "$1" ]; then - printf 'Missing %s.\n\n' "$2" >&2 - usage >&2 - exit 2 - fi -} - if [ "$XMPP" = true ]; then - assert_arg "$MESSAGE" '-X MESSAGE' + eval "$(assert-arg "$MESSAGE" '-X MESSAGE')" xmpp -m "$MESSAGE" eu@euandreh.xyz & fi if [ "$SOUND" = true ]; then sound & fi if [ "$SPEAK" = true ]; then - assert_arg "$MESSAGE" '-S MESSAGE' + eval "$(assert-arg "$MESSAGE" '-S MESSAGE')" echo "$MESSAGE" | speak -v pt-BR & fi if [ "$MAIL" = true ]; then - assert_arg "$MESSAGE" '-m MESSAGE' + eval "$(assert-arg "$MESSAGE" '-m MESSAGE')" echo " " | email -s "$MESSAGE" eu@euandre.org & fi if [ "$DESKTOP" = true ]; then - assert_arg "$MESSAGE" '-D MESSAGE' + eval "$(assert-arg "$MESSAGE" '-D MESSAGE')" if [ "$OK" = true ]; then notify-send -t 5000 "$MESSAGE" & else -- cgit v1.2.3