From 2a3a940a4553a271d45722538697a667f9b55293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Mon, 23 Mar 2020 22:50:06 +0100 Subject: [PATCH] themes: change lstheme function to themes in $ZSH_CUSTOM in any level Also sort and remove duplicates, and pipe to fmt to improve output format. Fixes #8755 --- plugins/themes/themes.plugin.zsh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/plugins/themes/themes.plugin.zsh b/plugins/themes/themes.plugin.zsh index 1fbde5b64..cda83f587 100644 --- a/plugins/themes/themes.plugin.zsh +++ b/plugins/themes/themes.plugin.zsh @@ -23,5 +23,13 @@ function lstheme { # Resources: # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Modifiers # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Glob-Qualifiers - print "$ZSH_CUSTOM"/*.zsh-theme(N:t:r) {"$ZSH_CUSTOM","$ZSH"}/themes/*.zsh-theme(N:t:r) + { + # Show themes inside $ZSH_CUSTOM (in any subfolder) + # Strip $ZSH_CUSTOM/themes/ and $ZSH_CUSTOM/ from the name, so that it matches + # the value that should be written in $ZSH_THEME to load the theme. + print -l "$ZSH_CUSTOM"/**/*.zsh-theme(.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::) \ + + # Show themes inside $ZSH, stripping the head of the path. + print -l "$ZSH"/themes/*.zsh-theme(.N:t:r) + } | sort -u | fmt -w $COLUMNS }