mirror of
https://github.com/jorgebucaran/fisher
synced 2024-10-09 09:36:53 +02:00
Use verbose syntax
This commit is contained in:
parent
d0c30d9723
commit
6b1a886c58
2 changed files with 57 additions and 57 deletions
|
@ -1,7 +1,7 @@
|
|||
complete -c fisher -x -l help -d "Print usage help"
|
||||
complete -c fisher -x -l version -d "Print fisher version"
|
||||
complete -c fisher -x -n "__fish_use_subcommand" -a install -d "Install plugins"
|
||||
complete -c fisher -x -n "__fish_use_subcommand" -a update -d "Update installed plugins"
|
||||
complete -c fisher -x -n "__fish_use_subcommand" -a remove -d "Remove installed plugins"
|
||||
complete -c fisher -x -n "__fish_use_subcommand" -a list -d "List installed plugins matching optional regex"
|
||||
complete -c fisher -x -n "__fish_seen_subcommand_from update remove" -a "(fisher list)"
|
||||
complete -c fisher --exclusive --long help -d "Print usage help"
|
||||
complete -c fisher --exclusive --long version -d "Print version"
|
||||
complete -c fisher --exclusive --condition "__fish_use_subcommand" -a install -d "Install plugins"
|
||||
complete -c fisher --exclusive --condition "__fish_use_subcommand" -a update -d "Update installed plugins"
|
||||
complete -c fisher --exclusive --condition "__fish_use_subcommand" -a remove -d "Remove installed plugins"
|
||||
complete -c fisher --exclusive --condition "__fish_use_subcommand" -a list -d "List installed plugins matching optional regex"
|
||||
complete -c fisher --exclusive --condition "__fish_seen_subcommand_from update remove" -a "(fisher list)"
|
100
fisher.fish
100
fisher.fish
|
@ -1,8 +1,8 @@
|
|||
set -g fisher_version 4.1.0
|
||||
set --global fisher_version 4.1.0
|
||||
|
||||
function fisher -a cmd -d "fish plugin manager"
|
||||
set -q fisher_path || set -l fisher_path $__fish_config_dir
|
||||
set -l fish_plugins $__fish_config_dir/fish_plugins
|
||||
function fisher -a cmd -d "Fish plugin manager"
|
||||
set --query fisher_path || set --local fisher_path $__fish_config_dir
|
||||
set --local fish_plugins $__fish_config_dir/fish_plugins
|
||||
|
||||
switch "$cmd"
|
||||
case -v --version
|
||||
|
@ -19,15 +19,15 @@ function fisher -a cmd -d "fish plugin manager"
|
|||
case ls list
|
||||
string match --entire --regex -- "$argv[2]" $_fisher_plugins
|
||||
case install update remove
|
||||
isatty || read -laz stdin && set -a argv $stdin
|
||||
set -l install_plugins
|
||||
set -l update_plugins
|
||||
set -l remove_plugins
|
||||
set -l arg_plugins $argv[2..-1]
|
||||
set -l old_plugins $_fisher_plugins
|
||||
set -l new_plugins
|
||||
isatty || read -laz stdin && set --append argv $stdin
|
||||
set --local install_plugins
|
||||
set --local update_plugins
|
||||
set --local remove_plugins
|
||||
set --local arg_plugins $argv[2..-1]
|
||||
set --local old_plugins $_fisher_plugins
|
||||
set --local new_plugins
|
||||
|
||||
if not set -q argv[2]
|
||||
if not set --query argv[2]
|
||||
if test "$cmd" != update || test ! -e $fish_plugins
|
||||
echo "fisher: Not enough arguments for command: \"$cmd\"" >&2 && return 1
|
||||
end
|
||||
|
@ -36,47 +36,47 @@ function fisher -a cmd -d "fish plugin manager"
|
|||
|
||||
for plugin in $arg_plugins
|
||||
test -e "$plugin" && set plugin (realpath $plugin)
|
||||
contains -- "$plugin" $new_plugins || set -a new_plugins $plugin
|
||||
contains -- "$plugin" $new_plugins || set --append new_plugins $plugin
|
||||
end
|
||||
|
||||
if set -q argv[2]
|
||||
if set --query argv[2]
|
||||
for plugin in $new_plugins
|
||||
if contains -- "$plugin" $old_plugins
|
||||
if test "$cmd" = remove
|
||||
set -a remove_plugins $plugin
|
||||
set --append remove_plugins $plugin
|
||||
else
|
||||
set -a update_plugins $plugin
|
||||
set --append update_plugins $plugin
|
||||
end
|
||||
else if test "$cmd" != install
|
||||
echo "fisher: Plugin not installed: \"$plugin\"" >&2 && return 1
|
||||
else
|
||||
set -a install_plugins $plugin
|
||||
set --append install_plugins $plugin
|
||||
end
|
||||
end
|
||||
else
|
||||
for plugin in $new_plugins
|
||||
if contains -- "$plugin" $old_plugins
|
||||
set -a update_plugins $plugin
|
||||
set --append update_plugins $plugin
|
||||
else
|
||||
set -a install_plugins $plugin
|
||||
set --append install_plugins $plugin
|
||||
end
|
||||
end
|
||||
|
||||
for plugin in $old_plugins
|
||||
if not contains -- "$plugin" $new_plugins
|
||||
set -a remove_plugins $plugin
|
||||
set --append remove_plugins $plugin
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
set -l pid_list
|
||||
set -l source_plugins
|
||||
set -l fetch_plugins $update_plugins $install_plugins
|
||||
set --local pid_list
|
||||
set --local source_plugins
|
||||
set --local fetch_plugins $update_plugins $install_plugins
|
||||
echo -e "\x1b[1mfisher $cmd version $fisher_version\x1b[22m"
|
||||
|
||||
for plugin in $fetch_plugins
|
||||
set -l source (command mktemp -d)
|
||||
set -a source_plugins $source
|
||||
set --local source (command mktemp -d)
|
||||
set --append source_plugins $source
|
||||
|
||||
command mkdir -p $source/{completions,conf.d,functions}
|
||||
|
||||
|
@ -87,7 +87,7 @@ function fisher -a cmd -d "fish plugin manager"
|
|||
set temp (command mktemp -d)
|
||||
set name (string split \@ $plugin) || set name[2] HEAD
|
||||
set url https://codeload.github.com/\$name[1]/tar.gz/\$name[2]
|
||||
set -q fisher_user_api_token && set opts -u $fisher_user_api_token
|
||||
set --query fisher_user_api_token && set opts -u $fisher_user_api_token
|
||||
|
||||
echo -e \"Fetching \x1b[4m\$url\x1b[24m\"
|
||||
if command curl $opts -Ss -w \"\" \$url 2>&1 | command tar -xzf- -C \$temp 2>/dev/null
|
||||
|
@ -102,24 +102,24 @@ function fisher -a cmd -d "fish plugin manager"
|
|||
test ! -e $source && exit
|
||||
command mv -f (string match --entire --regex -- \.fish\\\$ $source/*) $source/functions 2>/dev/null" &
|
||||
|
||||
set -a pid_list (jobs --last --pid)
|
||||
set --append pid_list (jobs --last --pid)
|
||||
end
|
||||
|
||||
wait $pid_list 2>/dev/null
|
||||
|
||||
for plugin in $fetch_plugins
|
||||
if set -l source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] && test ! -e $source
|
||||
if set -l index (contains --index -- "$plugin" $install_plugins)
|
||||
set -e install_plugins[$index]
|
||||
if set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)] && test ! -e $source
|
||||
if set --local index (contains --index -- "$plugin" $install_plugins)
|
||||
set --erase install_plugins[$index]
|
||||
else
|
||||
set -e update_plugins[(contains --index -- "$plugin" $update_plugins)]
|
||||
set --erase update_plugins[(contains --index -- "$plugin" $update_plugins)]
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
for plugin in $update_plugins $remove_plugins
|
||||
if set -l index (contains --index -- "$plugin" $_fisher_plugins)
|
||||
set -l plugin_files_var _fisher_(string escape --style=var $plugin)_files
|
||||
if set --local index (contains --index -- "$plugin" $_fisher_plugins)
|
||||
set --local plugin_files_var _fisher_(string escape --style=var $plugin)_files
|
||||
|
||||
if contains -- "$plugin" $remove_plugins && set --erase _fisher_plugins[$index]
|
||||
for file in (string match --entire --regex -- "conf\.d/" $$plugin_files_var)
|
||||
|
@ -135,22 +135,22 @@ function fisher -a cmd -d "fish plugin manager"
|
|||
end
|
||||
end
|
||||
|
||||
if set -q update_plugins[1] || set -q install_plugins[1]
|
||||
if set --query update_plugins[1] || set --query install_plugins[1]
|
||||
command mkdir -p $fisher_path/{functions,conf.d,completions}
|
||||
end
|
||||
|
||||
for plugin in $update_plugins $install_plugins
|
||||
set -l source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)]
|
||||
set -l files $source/{functions,conf.d,completions}/*
|
||||
set -l plugin_files_var _fisher_(string escape --style=var $plugin)_files
|
||||
set -q files[1] && set -U $plugin_files_var (string replace $source $fisher_path $files)
|
||||
set --local source $source_plugins[(contains --index -- "$plugin" $fetch_plugins)]
|
||||
set --local files $source/{functions,conf.d,completions}/*
|
||||
set --local plugin_files_var _fisher_(string escape --style=var $plugin)_files
|
||||
set --query files[1] && set -U $plugin_files_var (string replace $source $fisher_path $files)
|
||||
|
||||
for file in (string replace -- $source "" $files)
|
||||
command cp -Rf $source/$file $fisher_path/$file
|
||||
end
|
||||
|
||||
contains -- $plugin $_fisher_plugins || set -Ua _fisher_plugins $plugin
|
||||
contains -- $plugin $install_plugins && set -l event "install" || set -l event "update"
|
||||
contains -- $plugin $install_plugins && set --local event "install" || set --local event "update"
|
||||
echo -es "Installing \x1b[1m$plugin\x1b[22m" \n" "$$plugin_files_var
|
||||
|
||||
for file in (string match --entire --regex -- "[functions/|conf\.d/].*fish\$" $$plugin_files_var)
|
||||
|
@ -162,12 +162,12 @@ function fisher -a cmd -d "fish plugin manager"
|
|||
end
|
||||
|
||||
command rm -rf $source_plugins
|
||||
functions -q fish_prompt || source $__fish_data_dir/functions/fish_prompt.fish
|
||||
functions --query fish_prompt || source $__fish_data_dir/functions/fish_prompt.fish
|
||||
|
||||
set -q _fisher_plugins[1] || set -e _fisher_plugins
|
||||
set -q _fisher_plugins && printf "%s\n" $_fisher_plugins >$fish_plugins || command rm -f $fish_plugins
|
||||
set --query _fisher_plugins[1] || set --erase _fisher_plugins
|
||||
set --query _fisher_plugins && printf "%s\n" $_fisher_plugins >$fish_plugins || command rm -f $fish_plugins
|
||||
|
||||
set -l total (count $install_plugins) (count $update_plugins) (count $remove_plugins)
|
||||
set --local total (count $install_plugins) (count $update_plugins) (count $remove_plugins)
|
||||
test "$total" != "0 0 0" && echo (string join ", " (
|
||||
test $total[1] = 0 || echo "Installed $total[1]") (
|
||||
test $total[2] = 0 || echo "Updated $total[2]") (
|
||||
|
@ -179,16 +179,16 @@ function fisher -a cmd -d "fish plugin manager"
|
|||
end
|
||||
|
||||
## Migrations ##
|
||||
if functions -q _fisher_self_update || test -e $__fish_config_dir/fishfile # 3.x
|
||||
if functions --query _fisher_self_update || test -e $__fish_config_dir/fishfile # 3.x
|
||||
function _fisher_migrate
|
||||
function _fisher_complete
|
||||
fisher install jorgebucaran/fisher >/dev/null 2>/dev/null
|
||||
functions --erase _fisher_complete
|
||||
end
|
||||
set -q XDG_DATA_HOME || set XDG_DATA_HOME ~/.local/share
|
||||
set -q XDG_CACHE_HOME || set XDG_CACHE_HOME ~/.cache
|
||||
set -q XDG_CONFIG_HOME || set XDG_CONFIG_HOME ~/.config
|
||||
set -q fisher_path || set fisher_path $__fish_config_dir
|
||||
set --query XDG_DATA_HOME || set XDG_DATA_HOME ~/.local/share
|
||||
set --query XDG_CACHE_HOME || set XDG_CACHE_HOME ~/.cache
|
||||
set --query XDG_CONFIG_HOME || set XDG_CONFIG_HOME ~/.config
|
||||
set --query fisher_path || set fisher_path $__fish_config_dir
|
||||
test -e $__fish_config_dir/fishfile && command awk '/#|^gitlab|^ *$/ { next } $0' <$__fish_config_dir/fishfile >>$__fish_config_dir/fish_plugins
|
||||
command rm -rf $__fish_config_dir/fishfile $fisher_path/{conf.d,completions}/fisher.fish {$XDG_DATA_HOME,$XDG_CACHE_HOME,$XDG_CONFIG_HOME}/fisher
|
||||
functions --erase _fisher_migrate _fisher_copy_user_key_bindings _fisher_ls _fisher_fmt _fisher_self_update _fisher_self_uninstall _fisher_commit _fisher_parse _fisher_fetch _fisher_add _fisher_rm _fisher_jobs _fisher_now _fisher_help
|
||||
|
@ -196,8 +196,8 @@ if functions -q _fisher_self_update || test -e $__fish_config_dir/fishfile # 3.x
|
|||
end
|
||||
echo "Upgrading to Fisher $fisher_version -- learn more at" (set_color --bold --underline)"https://git.io/fisher-4"(set_color normal)
|
||||
_fisher_migrate >/dev/null 2>/dev/null
|
||||
else if functions -q _fisher_list # 4.0
|
||||
set -q XDG_DATA_HOME || set -l XDG_DATA_HOME ~/.local/share
|
||||
else if functions --query _fisher_list # 4.0
|
||||
set --query XDG_DATA_HOME || set --local XDG_DATA_HOME ~/.local/share
|
||||
test -e $XDG_DATA_HOME/fisher && command rm -rf $XDG_DATA_HOME/fisher
|
||||
functions --erase _fisher_list _fisher_plugin_parse
|
||||
echo -n "Upgrading to Fisher $fisher_version new in-memory state..."
|
||||
|
|
Loading…
Reference in a new issue