diff --git a/fish/functions/fbrew.fish b/fish/functions/fbrew.fish index 0437ea1..bccb9b4 100644 --- a/fish/functions/fbrew.fish +++ b/fish/functions/fbrew.fish @@ -31,7 +31,7 @@ function fbrew --description "Fuzzy homebrew" echo "Reticulating splines..." # Output is multiline with format "pkgname:" if no dependencies, otherwise "pkgname: dep1 dep2 dep3 ..." - set --local brew_deps_installed (string collect (brew deps --installed)) + set --local brew_deps_installed (brew deps --installed) # Accumulate packages and their dependencies set --local uninst_pkgs_all $uninst_pkgs diff --git a/fish/functions/fish_colors_check.fish b/fish/functions/fish_colors_check.fish index dbd84ac..5ac2ca1 100644 --- a/fish/functions/fish_colors_check.fish +++ b/fish/functions/fish_colors_check.fish @@ -8,8 +8,8 @@ function fish_colors_check --description 'Validate the fish color variables' --a return 2 end - set --local allcolors (string collect (rg --no-line-number --no-filename --only-matching 'fish(?:_pager)?_color[a-z_]*[a-z]+' $fish_srcdir | sort | uniq)) - set --local setcolors (string collect (set --names | string match 'fish*_color*')) + set --local allcolors (rg --no-line-number --no-filename --only-matching 'fish(?:_pager)?_color[a-z_]*[a-z]+' $fish_srcdir | sort | uniq) + set --local setcolors (set --names | string match 'fish*_color*') set --local missingcolors set --local unknowncolors diff --git a/install/install-brew-extra.fish b/install/install-brew-extra.fish index a3eccde..8164aad 100755 --- a/install/install-brew-extra.fish +++ b/install/install-brew-extra.fish @@ -3,7 +3,7 @@ # TODO: how to handle other taps (especially an issue for casks) function _install_extra_brews --argument-names favorite_brews - set --local brew_pkgs_installed (string collect (brew list)) + set --local brew_pkgs_installed (brew list --formula -1) set --local brew_pkgs_options for brew_pkg in (cat $favorite_brews) if not contains -- $brew_pkg $brew_pkgs_installed @@ -18,7 +18,7 @@ function _install_extra_brews --argument-names favorite_brews end function _install_extra_casks --argument-names favorite_casks - set --local brew_casks_installed (string collect (brew list --cask)) + set --local brew_casks_installed (brew list --cask -1) set --local brew_casks_options for brew_cask in (cat $favorite_casks) if not contains -- $brew_cask $brew_casks_installed