Skip to content

Commit a01b983

Browse files
authored
Merge branch 'master' into rc
2 parents dfb2155 + f867c50 commit a01b983

File tree

4 files changed

+23
-6
lines changed

4 files changed

+23
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ In SDDM, please choose `Hyprland (UWSM Managed)` as your session. Or else you wi
2828
- Core: app2unit.sh and xdg-terminal-exec as as static dependencies. These tools are not widely available and are not part of the core dependencies.
2929
- The ~/.config/xdg-terminals.list file is now used to determine which terminal to use.
3030
- Wallbash: Added spotify flatpak support
31+
- Migration script implementation
3132

3233
### Fixed
3334

Configs/.local/lib/hyde/globalcontrol.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,13 @@ export themesDir="$THEMES_DIR"
3232
export fontsDir="$FONTS_DIR"
3333
export hashMech="sha1sum"
3434

35+
36+
#? avoid notify-send to stall the script
37+
send_notifs () {
38+
local args=("$@")
39+
notify-send "${args[@]}" &
40+
}
41+
3542
print_log() {
3643
# [ -t 1 ] && return 0 # Skip if not in the terminal
3744
while (("$#")); do
@@ -102,6 +109,8 @@ print_log() {
102109
echo "" >&2
103110
}
104111

112+
113+
105114
get_hashmap() {
106115
unset wallHash
107116
unset wallList
@@ -540,4 +549,4 @@ export -f get_hyprConf get_rofi_pos \
540549
get_themes print_log \
541550
pkg_installed paste_string \
542551
extract_thumbnail accepted_mime_types \
543-
dconf_write
552+
dconf_write send_notifs

Configs/.local/lib/hyde/shaders.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ shaders_dir="$confDir/hypr/shaders"
88

99
# Ensure the shaders directory exists
1010
if [ ! -d "$shaders_dir" ]; then
11-
notify-send -i "preferences-desktop-display" "Error" "Shaders directory does not exist at $shaders_dir"
11+
send_notifs -i "preferences-desktop-display" "Error" "Shaders directory does not exist at $shaders_dir"
1212
exit 1
1313
fi
1414

@@ -56,7 +56,7 @@ fn_select() {
5656
fi
5757

5858
if [ -z "$shader_items" ]; then
59-
notify-send -i "preferences-desktop-display" "Error" "No .frag files found in $shaders_dir"
59+
send_notifs -i "preferences-desktop-display" "Error" "No .frag files found in $shaders_dir"
6060
exit 1
6161
fi
6262

@@ -96,7 +96,7 @@ fn_select() {
9696

9797
set_conf "HYPR_SHADER" "$selected_shader"
9898
fn_update "$selected_shader"
99-
notify-send -i "preferences-desktop-display" "Shader:" "$selected_shader"
99+
send_notifs -i "preferences-desktop-display" "Shader:" "$selected_shader"
100100
}
101101

102102
fn_reload() {
@@ -105,7 +105,7 @@ fn_reload() {
105105
fi
106106
set_conf "HYPR_SHADER" "$HYPR_SHADER"
107107
fn_update "$HYPR_SHADER"
108-
notify-send -i "preferences-desktop-display" "Shader reloaded:" "$HYPR_SHADER"
108+
send_notifs -i "preferences-desktop-display" "Shader reloaded:" "$HYPR_SHADER"
109109
}
110110

111111
concat_shader_files() {

Scripts/migrations/v25.8.2.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
#!/usr/bin/env bash
1+
#!/usr/bin/env sh
2+
3+
if ! command -v uwsm >/dev/null 2>&1; then
4+
5+
echo "'uwsm' package is required for this update. Please install it."
6+
echo "You can also run './install.sh' to install all missing dependencies."
7+
8+
fi
29

310
if command -v hyde-shell >/dev/null 2>&1; then
411
echo "Reloading Hyde shell shaders..."

0 commit comments

Comments
 (0)