tmux-plugins/tpm
1
0
Fork 0
mirror of https://github.com/tmux-plugins/tpm.git synced 2025-11-04 08:36:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue with automatic tpm install

Browse Source 
Fixes #99
This commit is contained in:
Bruno Sutic
2020-10-18 13:13:08 +02:00
parent 60a36d6f7a
commit aeb196db5c
3 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/install_plugins
View File

@@ -8,7 +8,10 @@
CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
SCRIPTS_DIR="$CURRENT_DIR/../scripts" SCRIPTS_DIR="$CURRENT_DIR/../scripts"
source "$SCRIPTS_DIR/helpers/tpm_path.sh"
main() { main() {
set_tpm_path
"$SCRIPTS_DIR/install_plugins.sh" # has correct exit code "$SCRIPTS_DIR/install_plugins.sh" # has correct exit code
} }
main main

30
scripts/helpers/tpm_path.sh Normal file
View File

@@ -0,0 +1,30 @@
CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source "$CURRENT_DIR/../variables.sh"
tpm_path_set() {
tmux show-environment -g "$DEFAULT_TPM_ENV_VAR_NAME" >/dev/null 2>&1
}
# Check if configuration file exists at an XDG-compatible location, if so use
# 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"
}
# Ensures TMUX_PLUGIN_MANAGER_PATH global env variable is set.
#
# Put this in `.tmux.conf` to override the default:
# `set-environment -g TMUX_PLUGIN_MANAGER_PATH "/some/other/path/"`
set_tpm_path() {
if ! tpm_path_set; then
set_default_tpm_path
fi
}

29
tpm
View File

@@ -4,7 +4,7 @@ CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
BINDINGS_DIR="$CURRENT_DIR/bindings" BINDINGS_DIR="$CURRENT_DIR/bindings"
SCRIPTS_DIR="$CURRENT_DIR/scripts" SCRIPTS_DIR="$CURRENT_DIR/scripts"
source "$SCRIPTS_DIR/variables.sh" source "$SCRIPTS_DIR/helpers/tpm_path.sh"
get_tmux_option() { get_tmux_option() {
local option="$1" local option="$1"
@@ -17,33 +17,6 @@ get_tmux_option() {
fi fi
} }
tpm_path_set() {
tmux show-environment -g "$DEFAULT_TPM_ENV_VAR_NAME" >/dev/null 2>&1
}
# Check if configuration file exists at an XDG-compatible location, if so use
# 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"
}
# Ensures TMUX_PLUGIN_MANAGER_PATH global env variable is set.
#
# Put this in `.tmux.conf` to override the default:
# `set-environment -g TMUX_PLUGIN_MANAGER_PATH "/some/other/path/"`
set_tpm_path() {
if ! tpm_path_set; then
set_default_tpm_path
fi
}
# 1. Fetches plugin names from `@plugin` variables # 1. Fetches plugin names from `@plugin` variables
# 2. Creates full plugin path # 2. Creates full plugin path
# 3. Sources all *.tmux files from each of the plugin directories # 3. Sources all *.tmux files from each of the plugin directories