From 583e447d33ee0b48221737406e8fd1cccc1ff4a2 Mon Sep 17 00:00:00 2001 From: Bruno Sutic Date: Tue, 2 Jun 2015 23:27:22 +0200 Subject: [PATCH] Use `-g` in new plugin definition syntax When tmux options are used without `-g` tmux complains on startup. --- CHANGELOG.md | 1 + scripts/shared_functions.sh | 2 +- tests/test_plugin_installation.sh | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d19ea5c..c88b979 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - start using `C-c` to clear screen - add uninstall/clean procedure and keybinding (prefix+alt+u) (@chilicuil) - add new `set @plugin 'repo'` plugin defintion syntax (@chilicuil) +- revert back to using `-g` flag in new plugin definition syntax ### v1.2.2, 2015-02-08 - set GIT_TERMINAL_PROMPT=0 when doing `git clone`, `pull` or `submodule update` diff --git a/scripts/shared_functions.sh b/scripts/shared_functions.sh index 2d67d31..8aac0fb 100644 --- a/scripts/shared_functions.sh +++ b/scripts/shared_functions.sh @@ -17,7 +17,7 @@ shared_get_tpm_plugins_list() { if [ -z "${plugins_list}" ]; then #read set @plugin "tmux-plugins/tmux-example-plugin" entries cat /etc/tmux.conf ~/.tmux.conf 2>/dev/null | - awk '/^set +@plugin/ { gsub(/'\''/,""); gsub(/'\"'/,""); print $3 }' + awk '/^set +-g +@plugin/ { gsub(/'\''/,""); gsub(/'\"'/,""); print $4 }' else printf "%s\\n" "${plugins_list}" fi diff --git a/tests/test_plugin_installation.sh b/tests/test_plugin_installation.sh index da487ba..90603f5 100755 --- a/tests/test_plugin_installation.sh +++ b/tests/test_plugin_installation.sh @@ -6,7 +6,7 @@ source $CURRENT_DIR/helpers.sh test_plugin_installation() { set_tmux_conf_helper <<- HERE - set @plugin "tmux-plugins/tmux-example-plugin" + set -g @plugin "tmux-plugins/tmux-example-plugin" run-shell "$PWD/tpm" HERE @@ -23,8 +23,8 @@ test_plugin_installation() { test_multiple_plugins_installation() { set_tmux_conf_helper <<- HERE - set @plugin "tmux-plugins/tmux-example-plugin" - set @plugin 'tmux-plugins/tmux-copycat' + set -g @plugin "tmux-plugins/tmux-example-plugin" + set -g @plugin 'tmux-plugins/tmux-copycat' run-shell "$PWD/tpm" HERE