From d82c423eb976a9a33dbacda30ed0ccfd73011286 Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Wed, 21 Feb 2024 08:42:16 +0100 Subject: [PATCH] Updates --- scripts/installupdates.sh | 1 - waybar/themeswitcher.sh | 24 +++++++++++++----------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/scripts/installupdates.sh b/scripts/installupdates.sh index 057a1aa..178d7dc 100755 --- a/scripts/installupdates.sh +++ b/scripts/installupdates.sh @@ -13,7 +13,6 @@ sleep 1 clear figlet "Updates" -EOF _isInstalledYay() { package="$1"; diff --git a/waybar/themeswitcher.sh b/waybar/themeswitcher.sh index 7b597ed..69ba415 100755 --- a/waybar/themeswitcher.sh +++ b/waybar/themeswitcher.sh @@ -5,7 +5,7 @@ # | | | | | | __/ | | | | | __/\__ \\ V V /| | || (__| | | | __/ | # |_| |_| |_|\___|_| |_| |_|\___||___/ \_/\_/ |_|\__\___|_| |_|\___|_| # -# by Stephan Raabe (2023) +# by Stephan Raabe (2024) # ----------------------------------------------------- # ----------------------------------------------------- @@ -25,16 +25,18 @@ listNames="" options=$(find $themes_path -maxdepth 2 -type d) for value in $options do - if [ ! $value == "$themes_path" ]; then - if [ $(find $value -maxdepth 1 -type d | wc -l) = 1 ]; then - result=$(echo $value | sed "s#$HOME/dotfiles/waybar/themes/#/#g") - IFS='/' read -ra arrThemes <<< "$result" - listThemes[${#listThemes[@]}]="/${arrThemes[1]};$result" - if [ -f $themes_path$result/config.sh ]; then - source $themes_path$result/config.sh - listNames+="$theme_name\n" - else - listNames+="/${arrThemes[1]};$result\n" + if [ ! $value == "$HOME/dotfiles/waybar/themes/assets" ]; then + if [ ! $value == "$themes_path" ]; then + if [ $(find $value -maxdepth 1 -type d | wc -l) = 1 ]; then + result=$(echo $value | sed "s#$HOME/dotfiles/waybar/themes/#/#g") + IFS='/' read -ra arrThemes <<< "$result" + listThemes[${#listThemes[@]}]="/${arrThemes[1]};$result" + if [ -f $themes_path$result/config.sh ]; then + source $themes_path$result/config.sh + listNames+="$theme_name\n" + else + listNames+="/${arrThemes[1]};$result\n" + fi fi fi fi