summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2016-01-17 16:00:48 (EST)
committer P. J. McDermott <pj@pehjota.net>2016-01-17 16:00:48 (EST)
commite3ab87a78aafd979f6eb8bb75ef70304d87a1d6b (patch)
treee3ecd4028e888d6eb587d9703ace4d90396a624a
parentb18172598f83bbdc0dc8dd99ed7f587972fc8b32 (diff)
error(): Remove freshly executed murderous codefeature/improve-error-handling
-rw-r--r--src/output.sh27
1 files changed, 6 insertions, 21 deletions
diff --git a/src/output.sh b/src/output.sh
index 320a46b..1677fb5 100644
--- a/src/output.sh
+++ b/src/output.sh
@@ -20,28 +20,13 @@
error()
{
- case "${1}" in
- *[!0-9]*)
- local fmt="${1}"
- shift 1
+ local fmt="${1}"
+ shift 1
- printf '%s: Error: ' "${0##*/}" >&2
- printf "${fmt}\n" "${@}" >&2
- ;;
- *)
- local status=${1}
- local fmt="${2}"
- shift 2
-
- printf '%s: Error: ' "${0##*/}" >&2
- printf "${fmt}\n" "${@}" >&2
-
- # In a subshell, this will have no effect, so the
- # shell's exit status will be 128+SIGINT. Meh.
- exit_status=${status}
- kill -s INT ${$}
- ;;
- esac
+ printf '%s: Error: ' "${0##*/}" >&2
+ printf "${fmt}\n" "${@}" >&2
+
+ return 0
}
warn()