From 2a6145d74fde0b5c48b06dd734a7ce1d86218b2d Mon Sep 17 00:00:00 2001 From: sylph1o Date: Wed, 5 Apr 2023 16:40:56 +0200 Subject: [PATCH] we don't rely on TPM to scan configuration files anymore... as such we need to populate the @tpm_plugins outside of the internet connectivity check , otherwise TPM loads no plugin at all fixes #637 --- .tmux.conf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.tmux.conf b/.tmux.conf index b29aa34..05392c9 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -1483,13 +1483,12 @@ run 'cut -c3- "$TMUX_CONF" | sh -s _apply_configuration' # fi # else # if [ "$(command tmux display -p '#{pid} #{version} #{socket_path}')" = "$($TMUX_PROGRAM display -p '#{pid} #{version} #{socket_path}')" ]; then -# if git ls-remote -hq https://github.com/gpakosz/.tmux.git master > /dev/null; then -# tpm_plugins=$(cat << EOF | tr ' ' '\n' | awk '/^\s*$/ {next;}; !seen[$0]++ { gsub(/^[ \t]+/,"",$0); gsub(/[ \t]+$/,"",$0); print $0 }' -# $(awk '/^[ \t]*set(-option)?.*[ \t]@plugin[ \t]/ { gsub(/'\''/, ""); gsub(/'\"'/, ""); print $NF }' "$TMUX_CONF_LOCAL" 2>/dev/null) +# tpm_plugins=$(cat << EOF | tr ' ' '\n' | awk '/^\s*$/ {next;}; !seen[$0]++ { gsub(/^[ \t]+/,"",$0); gsub(/[ \t]+$/,"",$0); print $0 }' +# $(awk '/^[ \t]*set(-option)?.*[ \t]@plugin[ \t]/ { gsub(/'\''/, ""); gsub(/'\"'/, ""); print $NF }' "$TMUX_CONF_LOCAL" 2>/dev/null) # EOF -# ) -# tmux set -g '@tpm_plugins' "$tpm_plugins" -# +# ) +# tmux set -g '@tpm_plugins' "$tpm_plugins" +# if git ls-remote -hq https://github.com/gpakosz/.tmux.git master > /dev/null; then # if [ ! -d "$TMUX_PLUGIN_MANAGER_PATH/tpm" ]; then # install_tpm=true # tmux display 'Installing tpm and plugins...'