From 250844dc34206490fc418f19ce33f2471f9520a0 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Fri, 22 Jul 2022 15:18:43 -0500 Subject: Break _radish_not_running into its own function --- radish | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/radish b/radish index d8c55b1..0883946 100755 --- a/radish +++ b/radish @@ -118,16 +118,22 @@ _radish_tags() { cut -f3 "${1:--}" 2>/dev/null } +_radish_not_running() { + echo >&2 "Running radish not found." + exit 2 +} + echo() { printf '%s\n' "$*"; } ### Main functionality radish_kill() { - printf >&2 '%s' "Killing radish..." - _radish_kill_impl || { - echo >&2 "I don't think radish is running." - exit 2 - } + if [ -f "$RADISH_PID_FILE" ]; then + printf >&2 '%s' "Killing radish..." + _radish_kill_impl + else + _radish_not_running + fi cleanup exit } @@ -139,7 +145,7 @@ radish_status() { else follow= fi - tail $follow "$RADISH_STATUS_FILE" + tail $follow "$RADISH_STATUS_FILE" 2>/dev/null || _radish_not_running echo exit } -- cgit 1.4.1-21-gabe81