psi-jack
/
tpm
mirror of
1
0
Fork 0
Code Issues Releases Wiki Activity

Add ability to use branches for plugins

This commit is contained in:
Ashish Shah 2017-11-23 15:06:54 -06:00
parent 95f78336c3
commit 73a419c599
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/helpers/plugin_functions.sh
View File

@ -56,7 +56,7 @@ tpm_plugins_list_helper() {
# read set -g @plugin "tmux-plugins/tmux-example-plugin" entries # read set -g @plugin "tmux-plugins/tmux-example-plugin" entries
_tmux_conf_contents "full" | _tmux_conf_contents "full" |
awk '/^[ \t]*set(-option)? +-g +@plugin/ { gsub(/'\''/,""); gsub(/'\"'/,""); print $4 }' awk '/^[ \t]*set(-option)? +-g +@plugin/ { gsub(/'\''/,""); gsub(/'\"'/,""); gsub(/#/, " "); print $4","$5 }'
} }
# Allowed plugin name formats: # Allowed plugin name formats:

22
scripts/install_plugins.sh
View File

@ -14,8 +14,12 @@ fi
clone() { clone() {
local plugin="$1" local plugin="$1"
cd "$(tpm_path)" && local branch="$2"
GIT_TERMINAL_PROMPT=0 git clone --recursive "$plugin" >/dev/null 2>&1 if [ ! -z "$branch" ]; then
cd "$(tpm_path)" && GIT_TERMINAL_PROMPT=0 git clone --recursive -b "$branch" "$plugin" >/dev/null 2>&1
else
cd "$(tpm_path)" && GIT_TERMINAL_PROMPT=0 git clone --recursive "$plugin" >/dev/null 2>&1
fi
} }
# tries cloning: # tries cloning:
@ -23,20 +27,22 @@ clone() {
# 2. expands the plugin name to point to a github repo and tries cloning again # 2. expands the plugin name to point to a github repo and tries cloning again
clone_plugin() { clone_plugin() {
local plugin="$1" local plugin="$1"
clone "$plugin" || local branch="$2"
clone "https://git::@github.com/$plugin" clone "$plugin" "$branch" ||
clone "https://git::@github.com/$plugin" "$branch"
} }
# clone plugin and produce output # clone plugin and produce output
install_plugin() { install_plugin() {
local plugin="$1" local plugin="$1"
local branch="$2"
local plugin_name="$(plugin_name_helper "$plugin")" local plugin_name="$(plugin_name_helper "$plugin")"
if plugin_already_installed "$plugin"; then if plugin_already_installed "$plugin"; then
echo_ok "Already installed \"$plugin_name\"" echo_ok "Already installed \"$plugin_name\""
else else
echo_ok "Installing \"$plugin_name\"" echo_ok "Installing \"$plugin_name\""
clone_plugin "$plugin" && clone_plugin "$plugin" "$branch" &&
echo_ok " \"$plugin_name\" download success" || echo_ok " \"$plugin_name\" download success" ||
echo_err " \"$plugin_name\" download fail" echo_err " \"$plugin_name\" download fail"
fi fi
@ -44,8 +50,10 @@ install_plugin() {
install_plugins() { install_plugins() {
local plugins="$(tpm_plugins_list_helper)" local plugins="$(tpm_plugins_list_helper)"
for plugin in $plugins; do for plugin_line in $plugins; do
install_plugin "$plugin" local plugin=$(echo $plugin_line | awk -F',' '{print $1}')
local branch=$(echo $plugin_line | awk -F',' '{print $2}')
install_plugin "$plugin" "$branch"
done done
} }