From 2549ac1f4bfbc4f0177b05c1acd080c7c926128c Mon Sep 17 00:00:00 2001 From: Jorge Bucaran Date: Mon, 8 Oct 2018 09:36:45 +0900 Subject: [PATCH] fix: make trailing / optional in \$fisher_config; close #462 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit $fisher_config/foo/bar → foo/bar {$fisher_config}foo/bar → foo/bar $fisher_config//foo/bar → foo/bar --- fisher.fish | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fisher.fish b/fisher.fish index a69409e..8afa174 100644 --- a/fisher.fish +++ b/fisher.fish @@ -83,7 +83,7 @@ function _fisher_ls set -l pkgs $fisher_config/*/*/* for pkg in $pkgs command readlink $pkg; and continue; or echo $pkg - end | command sed "s|$fisher_config/||;s|github\.com/||" + end | command sed "s|$fisher_config/*||;s|github\.com/||" end function _fisher_version -a file @@ -170,7 +170,7 @@ function _fisher_commit set -l added_pkgs (_fisher_pkg_fetch_all $expected_pkgs) set -l updated_pkgs ( for pkg in $removed_pkgs - set pkg (echo $pkg | command sed "s|$fisher_config/||") + set pkg (echo $pkg | command sed "s|$fisher_config/*||") if contains -- $pkg $added_pkgs echo $pkg end