Skip to content

Commit 3cb0434

Browse files
committed
fix(fastfetch): Correct random handler
1 parent 503711a commit 3cb0434

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

Configs/.local/lib/hyde/fastfetch.sh

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ iconDir="${XDG_DATA_HOME:-$HOME/.local/share}/icons"
3232
image_dirs=()
3333
hyde_distro_logo=${iconDir}/Wallbash-Icon/distro/$LOGO
3434

35-
# Parse the main command
35+
# Parse the main command
3636
case $1 in
3737
logo) # eats around 13 ms
3838
random() {
@@ -42,10 +42,17 @@ logo) # eats around 13 ms
4242
if [ -n "${HYDE_THEME}" ] && [ -d "${confDir}/hyde/themes/${HYDE_THEME}/logo" ]; then
4343
image_dirs+=("${confDir}/hyde/themes/${HYDE_THEME}/logo")
4444
fi
45-
[ -d "$HYDE_CACHE_HOME" ] && image_dirs+=("$HYDE_CACHE_HOME")
45+
# [ -d "$HYDE_CACHE_HOME" ] && image_dirs+=("$HYDE_CACHE_HOME")
4646
[ -f "$hyde_distro_logo" ] && echo "${hyde_distro_logo}"
47-
[ -f "$HOME/.face.icon" ] && echo "$HOME/.face.icon"
48-
47+
image_dirs+=("$HYDE_CACHE_HOME/wall.quad")
48+
image_dirs+=("$HYDE_CACHE_HOME/wall.sqre")
49+
[ -f "$HOME/.face.icon" ] && image_dirs+=("$HOME/.face.icon")
50+
[ -f "$hyde_distro_logo" ] && image_dirs+=("$hyde_distro_logo")
51+
image_dirs+=("${confDir}/fastfetch/logo")
52+
image_dirs+=("${iconDir}/Wallbash-Icon/fastfetch/")
53+
if [ -n "${HYDE_THEME}" ] && [ -d "${confDir}/hyde/themes/${HYDE_THEME}/logo" ]; then
54+
image_dirs+=("${confDir}/hyde/themes/${HYDE_THEME}/logo")
55+
fi
4956
find -L "${image_dirs[@]}" -maxdepth 1 -type f \( -name "wall.quad" -o -name "wall.sqre" -o -name "*.icon" -o -name "*logo*" -o -name "*.png" \) ! -path "*/wall.set*" ! -path "*/wallpapers/*.png" 2>/dev/null
5057
) | shuf -n 1
5158
}
@@ -76,19 +83,20 @@ HELP
7683
[[ "$1" = "--rand" ]] && random && exit
7784
[[ "$1" = *"help"* ]] && help && exit
7885
(
86+
image_dirs=()
7987
for arg in "$@"; do
8088
case $arg in
8189
--quad)
82-
echo "$HYDE_CACHE_HOME/wall.quad"
90+
image_dirs+=("$HYDE_CACHE_HOME/wall.quad")
8391
;;
8492
--sqre)
85-
echo "$HYDE_CACHE_HOME/wall.sqre"
93+
image_dirs+=("$HYDE_CACHE_HOME/wall.sqre")
8694
;;
8795
--prof)
88-
[ -f "$HOME/.face.icon" ] && echo "$HOME/.face.icon"
96+
[ -f "$HOME/.face.icon" ] && image_dirs+=("$HOME/.face.icon")
8997
;;
9098
--os)
91-
echo "$hyde_distro_logo"
99+
[ -f "$hyde_distro_logo" ] && image_dirs+=("$hyde_distro_logo")
92100
;;
93101
--local)
94102
image_dirs+=("${confDir}/fastfetch/logo")
@@ -103,8 +111,8 @@ HELP
103111
;;
104112
esac
105113
done
106-
find -L "${image_dirs[@]}" -maxdepth 1 -type f \( -name "wall.quad" -o -name "wall.sqre" -o -name "*.icon" -o -name "*logo*" -o -name "*.png" \) ! -path "*/wall.set*" ! -path "*/wallpapers/*.png" 2>/dev/null
107-
) | shuf -n 1
114+
find -L "${image_dirs[@]}" -maxdepth 1 -type f \( -name "wall.quad" -o -name "wall.sqre" -o -name "*.icon" -o -name "*logo*" -o -name "*.png" \) ! -path "*/wall.set*" ! -path "*/wallpapers/*.png" 2>/dev/null
115+
) | shuf -n 1
108116

109117
;;
110118
--select | -S)

0 commit comments

Comments
 (0)