From 626253d791c92946015b2c1bc2d915aaf96ee6c0 Mon Sep 17 00:00:00 2001 From: perfectra1n Date: Sun, 19 Feb 2023 18:38:46 -0800 Subject: [PATCH] Fix log messages when attempting to rebuild the plugin. Fix log messages when attempting to rebuild the plugin, as the previous messages were showing the incorrect output if `cmake` failed, or if `make` failed to execute. --- tmux-mem-cpu-load.plugin.tmux | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tmux-mem-cpu-load.plugin.tmux b/tmux-mem-cpu-load.plugin.tmux index 451f23d..314c801 100755 --- a/tmux-mem-cpu-load.plugin.tmux +++ b/tmux-mem-cpu-load.plugin.tmux @@ -21,12 +21,24 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" pushd $CURRENT_DIR #Pushd to the directory where this plugin is located. # Attempt to rebuild the plugin and log any errors in the tmux display window. -if output=$(cmake . 2>&1); then tmux run-shell "echo \"'cmake $CURRENT_DIR' failed. -$output -\""; else exit 1; fi +if output=$(cmake . 2>&1); then + tmux run-shell "echo \"'cmake $CURRENT_DIR' completed successfully. + \"" +else + tmux run-shell "echo \"'cmake $CURRENT_DIR' failed. Error logged below. + $output + \"" + exit 1 +fi -if output=$(make 2>&1); then tmux run-shell "echo \"tmux-mem-cpu-load failed to build. -$output -\""; else exit 1; fi +if output=$(make 2>&1); then + tmux run-shell "echo \"tmux-mem-cpu-load built successfully. + \"" +else + tmux run-shell "echo \"tmux-mem-cpu-load failed to build. Error logged below. + $output + \"" + exit 1 +fi popd