Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tmux-plugins/tpm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: OrkWard/tpm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 2, 2025

  1. feat: run install script in the background

    @OrkWard
    OrkWard committed Jan 2, 2025
    Copy the full SHA
    9a557d2 View commit details
Showing with 9 additions and 10 deletions.
  1. +2 −2 bindings/install_plugins
  2. +7 −8 tpm
4 changes: 2 additions & 2 deletions bindings/install_plugins
View file
Original file line number Diff line number Diff line change
@@ -12,8 +12,8 @@ source "$HELPERS_DIR/tmux_utils.sh"

main() {
reload_tmux_environment
"$SCRIPTS_DIR/install_plugins.sh" --tmux-echo >/dev/null 2>&1
"$SCRIPTS_DIR/install_plugins.sh" --tmux-echo
reload_tmux_environment
end_message
# end_message
}
main
15 changes: 7 additions & 8 deletions tpm
View file
Original file line number Diff line number Diff line change
@@ -25,13 +25,12 @@ tpm_path_set() {
# that directory for TMUX_PLUGIN_MANAGER_PATH. Otherwise use $DEFAULT_TPM_PATH.
set_default_tpm_path() {
local xdg_tmux_path="${XDG_CONFIG_HOME:-$HOME/.config}/tmux"
local tpm_path="$DEFAULT_TPM_PATH"

if [ -f "$xdg_tmux_path/tmux.conf" ]; then
tpm_path="$xdg_tmux_path/plugins/"
fi

tmux set-environment -g "$DEFAULT_TPM_ENV_VAR_NAME" "$tpm_path"
tmux set-environment -g "$DEFAULT_TPM_ENV_VAR_NAME" "$xdg_tmux_path/plugins/"
else
tmux set-environment -g "$DEFAULT_TPM_ENV_VAR_NAME" "$DEFAULT_TPM_PATH"
fi
}

# Ensures TMUX_PLUGIN_MANAGER_PATH global env variable is set.
@@ -58,13 +57,13 @@ source_plugins() {
# prefix + alt + u - remove unused TPM plugins and reloads TMUX environment
set_tpm_key_bindings() {
local install_key="$(get_tmux_option "$install_key_option" "$default_install_key")"
tmux bind-key "$install_key" run-shell "$BINDINGS_DIR/install_plugins"
tmux bind-key "$install_key" run-shell -b "$BINDINGS_DIR/install_plugins"

local update_key="$(get_tmux_option "$update_key_option" "$default_update_key")"
tmux bind-key "$update_key" run-shell "$BINDINGS_DIR/update_plugins"
tmux bind-key "$update_key" run-shell -b "$BINDINGS_DIR/update_plugins"

local clean_key="$(get_tmux_option "$clean_key_option" "$default_clean_key")"
tmux bind-key "$clean_key" run-shell "$BINDINGS_DIR/clean_plugins"
tmux bind-key "$clean_key" run-shell -b "$BINDINGS_DIR/clean_plugins"
}

supported_tmux_version_ok() {