Merge pull request #89 from perfectra1n/master
Fix log messages when attempting to rebuild the plugin, and detect if the binary already exists to trigger rebuild.
This commit is contained in:
commit
a5d66aac16
@ -18,15 +18,32 @@
|
|||||||
# The directory where this plugin is located.
|
# The directory where this plugin is located.
|
||||||
CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
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.
|
pushd $CURRENT_DIR #Pushd to the directory where this plugin is located.
|
||||||
if output=$(cmake . 2>&1); then tmux run-shell "echo \"'cmake $CURRENT_DIR' failed.
|
|
||||||
$output
|
|
||||||
\""; else exit 1; fi
|
|
||||||
|
|
||||||
if output=$(make 2>&1); then tmux run-shell "echo \"tmux-mem-cpu-load failed to build.
|
# Attempt to rebuild the plugin and log any errors in the tmux display window.
|
||||||
$output
|
if output=$(cmake . 2>&1); then
|
||||||
\""; else exit 1; fi
|
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
|
||||||
|
|
||||||
popd
|
|
||||||
|
Loading…
Reference in New Issue
Block a user