looks in both $ZSH_CUSTOM and $ZSH_CUSTOM/themes

This commit is contained in:
deluxghost 2017-09-02 18:57:30 +08:00 committed by GitHub
commit c1c8417c7d

View file

@ -1,7 +1,7 @@
function theme function theme
{ {
if [ -z "$1" ] || [ "$1" = "random" ]; then if [ -z "$1" ] || [ "$1" = "random" ]; then
themes=($ZSH/themes/*.zsh-theme) themes=($(find $ZSH_CUSTOM $ZSH_CUSTOM/themes/ $ZSH/themes -name '*.zsh-theme'))
N=${#themes[@]} N=${#themes[@]}
((N=(RANDOM%N)+1)) ((N=(RANDOM%N)+1))
RANDOM_THEME=${themes[$N]} RANDOM_THEME=${themes[$N]}
@ -9,7 +9,9 @@ function theme
RANDOM_THEME_NAME=`echo "$RANDOM_THEME"|xargs -d '\n' -n 1 basename|sed 's/\(.*\)\..*/\1/'` RANDOM_THEME_NAME=`echo "$RANDOM_THEME"|xargs -d '\n' -n 1 basename|sed 's/\(.*\)\..*/\1/'`
echo "[oh-my-zsh] Random theme '$RANDOM_THEME_NAME' loaded." echo "[oh-my-zsh] Random theme '$RANDOM_THEME_NAME' loaded."
else else
if [ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]; then if [ -f "$ZSH_CUSTOM/$1.zsh-theme" ]; then
source "$ZSH_CUSTOM/$1.zsh-theme"
elif [ -f "$ZSH_CUSTOM/themes/$1.zsh-theme" ]; then
source "$ZSH_CUSTOM/themes/$1.zsh-theme" source "$ZSH_CUSTOM/themes/$1.zsh-theme"
elif [ -f "$ZSH/themes/$1.zsh-theme" ]; then elif [ -f "$ZSH/themes/$1.zsh-theme" ]; then
source "$ZSH/themes/$1.zsh-theme" source "$ZSH/themes/$1.zsh-theme"
@ -21,8 +23,8 @@ function theme
function lstheme function lstheme
{ {
ls -1 $ZSH/themes/*.zsh-theme $ZSH_CUSTOM/themes/*.zsh-theme \ find $ZSH_CUSTOM $ZSH_CUSTOM/themes/ $ZSH/themes -name '*.zsh-theme' \
| xargs -d '\n' -n 1 basename \ | xargs -d '\n' -n 1 basename \
| sed 's/\(.*\)\..*/\1/' \ | sed 's/\(.*\)\..*/\1/' \
| uniq | sort | column | sort -u | column
} }