From 13eba771eed7701ffbd2c51bdad5d040df63e2fe Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Sat, 6 Oct 2018 08:19:40 +0900 Subject: [PATCH] fix: prevent failglob error when $fisher_config is empty; close #455 fish-shell/fish-shell#2719 fish-shell/fish-shell#4175 --- fisher.fish | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fisher.fish b/fisher.fish index cfc011f..211db5e 100644 --- a/fisher.fish +++ b/fisher.fish @@ -130,21 +130,26 @@ function _fisher_self_update -a file end function _fisher_self_uninstall - printf "removing %s\n" $fisher_config $fisher_cache $fish_config/fishfile $fisher_path/{functions,completions}/fisher.fish | command sed "s|$HOME|~|" - _fisher_pkg_remove_all $fisher_config/*/*/* >/dev/null + set -l current_pkgs $fisher_config/*/*/* + set -l removed_pkgs (_fisher_pkg_remove_all $current_pkgs) + printf "removing %s\n" $removed_pkgs $fisher_config $fisher_cache $fisher_path/{functions,completions}/fisher.fish $fish_config/fishfile | command sed "s|$HOME|~|" + command rm -rf $fisher_config $fisher_cache 2>/dev/null command rm $fisher_path/{functions,completions}/fisher.fish $fish_config/fishfile 2>/dev/null + set -e fisher_cache set -e fisher_config set -e fisher_path set -e fisher_version + complete -c fisher --erase functions -e (functions -a | command awk '/^_fisher/') fisher end function _fisher_commit set -l elapsed (_fisher_now) - set -l removed_pkgs (_fisher_pkg_remove_all $fisher_config/*/*/*) + set -l current_pkgs $fisher_config/*/*/* + set -l removed_pkgs (_fisher_pkg_remove_all $current_pkgs) command rm -rf $fisher_config command mkdir -p $fisher_config