From 3dc86b62f7d80be648899a30fafe3ceb449ab219 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 23 Dec 2016 20:05:31 -0500 Subject: [PATCH] shell/tmux: don't install/run plugins in server mode --- shell/tmux/.tmux.conf | 2 +- shell/tmux/install | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/shell/tmux/.tmux.conf b/shell/tmux/.tmux.conf index e3f36748..804700bb 100644 --- a/shell/tmux/.tmux.conf +++ b/shell/tmux/.tmux.conf @@ -253,4 +253,4 @@ set -g @prefix_highlight_fg colour0 set -g @prefix_highlight_output_suffix ' #[bg=default] ' # Start plugin manager -run '~/.tmux/plugins/tpm/tpm' +if '[ -x ~/.tmux/plugins/tpm/tpm ]' 'run ~/.tmux/plugins/tpm/tpm' diff --git a/shell/tmux/install b/shell/tmux/install index 912b600b..7083530c 100755 --- a/shell/tmux/install +++ b/shell/tmux/install @@ -13,8 +13,10 @@ case $OSTYPE in ;; esac -git-repo() { [[ -d $2 ]] || git clone "https://github.com/$1" "$2"; } +if [[ -z $SERVER ]]; then + git-repo() { [[ -d $2 ]] || git clone "https://github.com/$1" "$2"; } -CWD="$(dirname $0)" -git-repo tmux-plugins/tpm "$CWD/.tmux/plugins/tpm" -git-repo jimeh/tmuxifier "$CWD/.tmuxifier" + CWD="$(dirname $0)" + git-repo tmux-plugins/tpm "$CWD/.tmux/plugins/tpm" + git-repo jimeh/tmuxifier "$CWD/.tmuxifier" +fi