Skip to content

Fix: wallpaper-restore.sh (safe expansion, handle spaces, add robustness checks) #1462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rajghosh06-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: wallpaper-restore.sh (safe expansion, handle spaces, add robustness checks) #1462

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 45 additions & 11 deletions dotfiles/.config/hypr/scripts/wallpaper-restore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,69 @@
# -----------------------------------------------------

ml4w_cache_folder="$HOME/.cache/ml4w/hyprland-dotfiles"

defaultwallpaper="$HOME/.config/ml4w/wallpapers/default.jpg"

cachefile="$ml4w_cache_folder/current_wallpaper"

# -----------------------------------------------------
# Get current wallpaper
# -----------------------------------------------------

if [ -f "$cachefile" ]; then
sed -i "s|~|$HOME|g" "$cachefile"
wallpaper=$(cat $cachefile)
if [ -f $wallpaper ]; then
echo ":: Wallpaper $wallpaper exists"
wallpaper=$(cat "$cachefile")

# Guard against empty cache
if [ -z "$wallpaper" ]; then
echo ":: Cache file empty. Using default."
wallpaper="$defaultwallpaper"
else
echo ":: Wallpaper $wallpaper does not exist. Using default."
wallpaper=$defaultwallpaper
# Expand leading ~ only if present
if [[ $wallpaper == ~* ]]; then
wallpaper="${wallpaper/#\~/$HOME}"
fi

# Normalize path (handles spaces safely)
wallpaper=$(realpath -m "$wallpaper")

# Ensure path is absolute
if [[ "$wallpaper" != /* ]]; then
echo ":: Path is not absolute. Using default."
wallpaper="$defaultwallpaper"
fi

# Handle broken symlinks
if [ -L "$wallpaper" ] && [ ! -e "$wallpaper" ]; then
echo ":: Wallpaper symlink is broken. Using default."
wallpaper="$defaultwallpaper"
fi

# Validate file existence
if [ -f "$wallpaper" ]; then
# Validate file type (basic extension check)
case "$wallpaper" in
*.jpg|*.jpeg|*.png|*.bmp|*.gif)
echo ":: Wallpaper $wallpaper exists"
;;
*)
echo ":: Not a valid image file. Using default."
wallpaper="$defaultwallpaper"
;;
esac
else
echo ":: Wallpaper $wallpaper does not exist. Using default."
wallpaper="$defaultwallpaper"
fi
fi
else
echo ":: $cachefile does not exist. Using default wallpaper."
wallpaper=$defaultwallpaper
wallpaper="$defaultwallpaper"
fi

# -----------------------------------------------------
# Set wallpaper
# -----------------------------------------------------

echo ":: Setting wallpaper with source image $wallpaper"
if [ -f ~/.local/bin/waypaper ]; then
export PATH=$PATH:~/.local/bin/
if [ -f "$HOME/.local/bin/waypaper" ]; then
export PATH="$PATH:$HOME/.local/bin/"
fi
waypaper --wallpaper "$wallpaper"