Simplify uninstall regexes, erase completions

This commit is contained in:
Jorge Bucaran 2021-01-15 00:07:55 +09:00
parent c3659bed01
commit da228c9f70
No known key found for this signature in database
GPG key ID: E54BA3C0E646DB30

View file

@ -123,17 +123,17 @@ function fisher -a cmd -d "Fish plugin manager"
set --local plugin_files_var _fisher_(string escape --style=var $plugin)_files set --local plugin_files_var _fisher_(string escape --style=var $plugin)_files
if contains -- "$plugin" $remove_plugins && set --erase _fisher_plugins[$index] if contains -- "$plugin" $remove_plugins && set --erase _fisher_plugins[$index]
for file in (string match --entire --regex -- "conf\.d/" $$plugin_files_var) for name in (string replace --filter --regex -- ".+/conf\.d/([^.]+)\.fish" '$1' $$plugin_files_var)
emit (string replace --all --regex -- '^.*/|\.fish$' "" $file)_uninstall emit {$name}_uninstall
end end
echo -es "Removing \x1b[1m$plugin\x1b[22m" \n" "$$plugin_files_var echo -es "Removing \x1b[1m$plugin\x1b[22m" \n" "$$plugin_files_var
end end
command rm -rf $$plugin_files_var command rm -rf $$plugin_files_var
functions --erase ( functions --erase (string replace --filter --regex -- ".+/functions/([^.]+)\.fish" '$1' $$plugin_files_var)
string match --entire --regex -- "functions/" $$plugin_files_var | for name in (string replace --filter --regex -- ".+/completions/([^.]+)\.fish" '$1' $$plugin_files_var)
string replace --all --regex -- '^.*/|\.fish$' "" complete --erase $name
) end
set --erase $plugin_files_var set --erase $plugin_files_var
end end
end end