linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor loading of theme into function for reusability

Browse source 
- Make sure to load a new theme after user 'unlikes' a theme
This commit is contained in:
Luke Lee 2011-06-03 19:05:28 -05:00
commit 4a052e88df
2 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/functions.zsh
View file

@ -64,7 +64,7 @@ function like_theme() {
theme_name=`get_current_theme` theme_name=`get_current_theme`
link_name="$FAVORITE_THEMES_DIR/$theme_name" link_name="$FAVORITE_THEMES_DIR/$theme_name"
if [[ ! -L $link_name ]]; then if [ ! -L $link_name ]; then
ln -s $RANDOM_THEME $link_name ln -s $RANDOM_THEME $link_name
echo "Added $theme_name to favorites" echo "Added $theme_name to favorites"
else else
@ -76,10 +76,10 @@ function unlike_theme() {
theme_name=`get_current_theme` theme_name=`get_current_theme`
link_name="$FAVORITE_THEMES_DIR/$theme_name" link_name="$FAVORITE_THEMES_DIR/$theme_name"
if [[ -L $link_name ]]; then if [ -L $link_name ]; then
# FIXME: What happens if we remove the last theme we have?
rm $link_name rm $link_name
echo "Removed $theme_name from favorites" echo "Removed $theme_name from favorites"
load_theme
else else
echo "$theme_name isn't a favorite" echo "$theme_name isn't a favorite"
fi fi
@ -100,3 +100,18 @@ function load_random_theme() {
echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..." echo "[oh-my-zsh] Random theme '$RANDOM_THEME' loaded..."
export RANDOM_THEME export RANDOM_THEME
} }
function load_theme() {
if [ "$ZSH_THEME" = "random" ]; then
load_random_theme
elif [ "$ZSH_THEME" = "favorites" ]; then
# Only randomize with liked themes if there are any
if [ `ls $FAVORITE_THEMES_DIR | wc -w` -gt 0 ]; then
load_random_theme $FAVORITE_THEMES_DIR/*zsh-theme
else
load_random_theme
fi
else
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
fi
}

18
oh-my-zsh.sh
View file

@ -33,27 +33,13 @@ done
# Load all of your custom configurations from custom/ # Load all of your custom configurations from custom/
for config_file ($ZSH/custom/*.zsh) source $config_file for config_file ($ZSH/custom/*.zsh) source $config_file
export FAVORITE_THEMES_DIR="$ZSH/themes/favorites/"
# Allow users to randomize themes with only their favorites # Allow users to randomize themes with only their favorites
if [ ! -d $FAVORITE_THEMES_DIR ]; then if [ ! -d $FAVORITE_THEMES_DIR ]; then
mkdir $FAVORITE_THEMES_DIR mkdir $FAVORITE_THEMES_DIR
fi fi
# Load the theme # Load theme (random/favorite/specific)
# Check for updates on initial load... load_theme
if [ "$ZSH_THEME" = "random" ]; then
load_random_theme
elif [ "$ZSH_THEME" = "favorites" ]; then
# Only randomize with liked themes if there are any
if [ `ls $FAVORITE_THEMES_DIR | wc -w` -gt 0 ]; then
load_random_theme $FAVORITE_THEMES_DIR/*zsh-theme
else
load_random_theme
fi
else
source "$ZSH/themes/$ZSH_THEME.zsh-theme"
fi
# Check for updates on initial load... # Check for updates on initial load...
if [ "$DISABLE_AUTO_UPDATE" = "true" ] if [ "$DISABLE_AUTO_UPDATE" = "true" ]