From 626253d791c92946015b2c1bc2d915aaf96ee6c0 Mon Sep 17 00:00:00 2001 From: perfectra1n Date: Sun, 19 Feb 2023 18:38:46 -0800 Subject: [PATCH 1/2] 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 From b0644d7372acf3f7fc4e9901ee6fc64ece113cca Mon Sep 17 00:00:00 2001 From: perfectra1n Date: Sun, 19 Feb 2023 21:57:12 -0800 Subject: [PATCH 2/2] Test to see if the binary already exists. --- tmux-mem-cpu-load.plugin.tmux | 47 +++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/tmux-mem-cpu-load.plugin.tmux b/tmux-mem-cpu-load.plugin.tmux index 314c801..9e30b69 100755 --- a/tmux-mem-cpu-load.plugin.tmux +++ b/tmux-mem-cpu-load.plugin.tmux @@ -18,27 +18,32 @@ # The directory where this plugin is located. CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -pushd $CURRENT_DIR #Pushd to the directory where this plugin is located. +if [ ! -f $CURRENT_DIR/tmux-mem-cpu-load ] && ! $(builtin type -P "tmux-mem-cpu-load" &> /dev/null) ; then + tmux run-shell "echo \"tmux-mem-cpu-load not found. Attempting to build. + \"" -# 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' completed successfully. - \"" -else - tmux run-shell "echo \"'cmake $CURRENT_DIR' failed. Error logged below. - $output - \"" - exit 1 + 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' 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 built successfully. + \"" + else + tmux run-shell "echo \"tmux-mem-cpu-load failed to build. Error logged below. + $output + \"" + exit 1 + fi + popd 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