projects/fisher
1
0
Fork 0
mirror of https://github.com/jorgebucaran/fisher synced 2024-07-06 23:11:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make fisher install behave like fisher when not on the right

Browse source 
side of a pipe. Correct fix for #218.
This commit is contained in:
Jorge Bucaran 2016-04-30 18:38:56 +09:00
parent f0b8514e4c
commit d387963fdb
No known key found for this signature in database
GPG key ID: E54BA3C0E646DB30
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
fisher.fish
View file

@ -77,7 +77,12 @@ function fisher
switch "$argv[1]" switch "$argv[1]"
case i install case i install
set -e argv[1] set -e argv[1]
set cmd "install"
if test -z "$argv"
set cmd "default"
else
set cmd "install"
end
case u up update case u up update
set -e argv[1] set -e argv[1]
@ -174,12 +179,10 @@ function fisher
switch "$cmd" switch "$cmd"
case install case install
if not __fisher_install $items if __fisher_install $items
return __fisher_log okay "Done in @"(__fisher_get_epoch_in_ms $elapsed | __fisher_humanize_duration)"@" $__fisher_stderr
end end
__fisher_log okay "Done in @"(__fisher_get_epoch_in_ms $elapsed | __fisher_humanize_duration)"@" $__fisher_stderr
case update case update
if isatty if isatty
if test -z "$items" if test -z "$items"
@ -260,34 +263,36 @@ function fisher
complete -c fisher --erase complete -c fisher --erase
source "$completions"
set -l config $fisher_config/* set -l config $fisher_config/*
set -l cache $fisher_cache/* set -l cache $fisher_cache/*
source "$completions"
if test ! -z "$config"
complete -xc fisher -n "__fish_seen_subcommand_from l ls list u up update r rm remove uninstall" -a "(printf '%s\n' $config | command sed 's|.*/||')"
complete -xc fisher -n "__fish_seen_subcommand_from l ls list u up update r rm remove uninstall" -a "$fisher_active_prompt" -d "Prompt"
end
if test -z "$config" if test -z "$config"
echo > $fisher_bundle echo > $fisher_bundle
else else
__fisher_plugin_get_url_info -- $config > $fisher_bundle __fisher_plugin_get_url_info -- $config > $fisher_bundle
complete -xc fisher -n "__fish_seen_subcommand_from l ls list u up update r rm remove uninstall" -a "(printf '%s\n' $config | command sed 's|.*/||')"
complete -xc fisher -n "__fish_seen_subcommand_from l ls list u up update r rm remove uninstall" -a "$fisher_active_prompt" -d "Prompt"
end end
if test ! -z "$cache" if test ! -z "$cache"
printf "%s\n" $cache | command awk -v _config="$config" ' printf "%s\n" $cache | command awk -v config="$config" '
BEGIN { BEGIN {
count = split(_config, config, " ") config_n = split(config, config_a, " ")
} }
{ {
sub(/.*\//, "") sub(/.*\//, "")
for (i = 1; i <= count; i++) { for (i = 1; i <= config_n; i++) {
sub(/.*\//, "", config[i]) sub(/.*\//, "", config_a[i])
if (config[i] == $0) { if (config_a[i] == $0) {
next next
} }
} }
@ -296,6 +301,7 @@ function fisher
// //
' | while read -l plugin ' | while read -l plugin
if __fisher_plugin_is_prompt "$fisher_cache/$plugin" if __fisher_plugin_is_prompt "$fisher_cache/$plugin"
complete -xc fisher -n "__fish_seen_subcommand_from i in install" -a "$plugin" -d "Prompt" complete -xc fisher -n "__fish_seen_subcommand_from i in install" -a "$plugin" -d "Prompt"
complete -xc fisher -n "not __fish_seen_subcommand_from u up update r rm remove uninstall l ls list ls-remote h help" -a "$plugin" -d "Prompt" complete -xc fisher -n "not __fish_seen_subcommand_from u up update r rm remove uninstall l ls list ls-remote h help" -a "$plugin" -d "Prompt"
@ -303,6 +309,7 @@ function fisher
complete -xc fisher -n "__fish_seen_subcommand_from i in install" -a "$plugin" -d "Plugin" complete -xc fisher -n "__fish_seen_subcommand_from i in install" -a "$plugin" -d "Plugin"
complete -xc fisher -n "not __fish_seen_subcommand_from u up update r rm remove uninstall l ls list ls-remote h help" -a "$plugin" -d "Plugin" complete -xc fisher -n "not __fish_seen_subcommand_from u up update r rm remove uninstall l ls list ls-remote h help" -a "$plugin" -d "Plugin"
end end
end end
end end