From 9d70776bd218a7b935c073173a9fdbb736ef1e22 Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Thu, 28 Apr 2016 14:36:18 +0900 Subject: [PATCH] Do not return 1 if `fisher` succeeds. Other * Better logic when leaving early in case of a fail install. * Colorize task completion duration. --- fisher.fish | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fisher.fish b/fisher.fish index 8c19bdd..ece7877 100644 --- a/fisher.fish +++ b/fisher.fish @@ -168,12 +168,12 @@ function fisher switch "$cmd" case install - if __fisher_install $items - __fisher_log okay "Done in "(__fisher_get_epoch_in_ms $elapsed | __fisher_humanize_duration) $__fisher_stderr - else + if not __fisher_install $items return end + __fisher_log okay "Done in @"(__fisher_get_epoch_in_ms $elapsed | __fisher_humanize_duration)"@" $__fisher_stderr + case update if isatty if test -z "$items" @@ -188,7 +188,7 @@ function fisher __fisher_update $items - __fisher_log okay "Done in "(__fisher_get_epoch_in_ms $elapsed | __fisher_humanize_duration) $__fisher_stderr + __fisher_log okay "Done in @"(__fisher_get_epoch_in_ms $elapsed | __fisher_humanize_duration)"@" $__fisher_stderr case ls if test "$argv" -ge 0 -o "$argv" = - @@ -224,7 +224,7 @@ function fisher __fisher_show_spinner end - __fisher_log okay "Done in "(__fisher_get_epoch_in_ms $elapsed | __fisher_humanize_duration) $__fisher_stderr + __fisher_log okay "Done in @"(__fisher_get_epoch_in_ms $elapsed | __fisher_humanize_duration)"@" $__fisher_stderr end end @@ -273,6 +273,8 @@ function fisher end end end + + return 0 end function __fisher_install