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

Match multiple keys with ls-remote [--format=fmt_str] k1 k2 k3

Browse source 
Also fix regression in ls-remote that was displaying both
installed and remote plugins.
This commit is contained in:
Jorge Bucaran 2016-04-30 04:00:44 +09:00
parent 7d27777aca
commit 4b27433300
No known key found for this signature in database
GPG key ID: E54BA3C0E646DB30
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
fisher.fish
View file

@ -228,7 +228,14 @@ function fisher
end
end
__fisher_list_remote "$format" $argv
if test -z "$format"
set format "%name\n"
__fisher_list_remote "$format" $argv | column
else
__fisher_list_remote "$format" $argv
end
case rm
if test -z "$items"
@ -959,7 +966,7 @@ function __fisher_list_remote_complete
end
function __fisher_list_remote -a format key
function __fisher_list_remote -a format
set -l index "$fisher_cache/.index"
if not __fisher_remote_index_update
@ -974,17 +981,12 @@ function __fisher_list_remote -a format key
return 1
end
set -l column_options
if test -z "$format"
set format "%name\n"
else
set column_options -c0
end
set -e argv[1]
set -l keys $argv
set -l config "$fisher_config"/*
command awk -v FS=\t -v format_s="$format" -v config="$config" -v key="$key" '
command awk -v FS=\t -v format_s="$format" -v config="$config" -v keys="$keys" '
function basename(s, n, a) {
n = split(s, a, "/")
@ -1014,7 +1016,8 @@ function __fisher_list_remote -a format key
}
BEGIN {
config_count = split(config, config_a)
keys_count = split(keys, keys_a, " ")
config_count = split(config, config_a, " ")
for (i = 1; i <= config_count; i++) {
config_a[i] = basename(config_a[i])
@ -1022,17 +1025,21 @@ function __fisher_list_remote -a format key
}
{
if (key == $1) {
record_printf(format_s, $1, $2, $3, $4)
exit
}
if (key == "" && !plugin_is_config($1) && !plugin_is_blacklisted($1)) {
record_printf(format_s, $1, $2, $3, $4)
if (keys_count > 0) {
for (i = 1; i <= keys_count; i++) {
if (keys_a[i] == $1) {
record_printf(format_s, $1, $2, $3, $4)
next
}
}
} else {
if (!plugin_is_config($1) && !plugin_is_blacklisted($1)) {
record_printf(format_s, $1, $2, $3, $4)
}
}
}
' < "$index" | command column $column_options
' < "$index"
end