Merge pull request #4 from nariox/master

Fixes (for ArchLinux at least)
This commit is contained in:
Chen Asraf
2017-07-24 11:03:43 +03:00
committed by GitHub
2 changed files with 9 additions and 8 deletions

View File

@@ -77,7 +77,7 @@ echo
echo "* Extracting zip... [4/5]"
# Extract the tar
# Wildcards are leftovers from before the structure was flat... keeping in case that changes again or more files are added
tar xvf "BitDay-$file.tar.gz" --wildcards '*.png'
tar xvf "BitDay-$file.tar.gz" --wildcards '*.png' --strip-components=1
rm -f "BitDay-$file.tar.gz"
echo "Done."

View File

@@ -33,8 +33,9 @@ hour=$(echo $hour | sed 's/^0*//')
# Different desktop environment implementations
case $XDG_CURRENT_DESKTOP in
Mint|Mate) setcmd="gsettings set org.mate.background picture-uri";;
Cinnamon) setcmd="gsettings set org.cinnamon.background picture-uri";;
*) setcmd="gsettings set org.gnome.desktop.background picture-uri";; # GNOME/Unity, default
MATE) setcmd="gsettings set org.mate.background picture-filename ";;
Cinnamon) setcmd="gsettings set org.cinnamon.background picture-uri file://";;
*) setcmd="gsettings set org.gnome.desktop.background picture-uri file://";; # GNOME/Unity, default
esac
if [[ -z $XDG_CURRENT_DESKTOP ]]; then # Fallback for i3
case $DESKTOP_SESSION in
@@ -42,14 +43,14 @@ if [[ -z $XDG_CURRENT_DESKTOP ]]; then # Fallback for i3
esac
fi
for i in $timing; do # Loop backwards through the wallpapers
if (( $hour >= $i )); then
$setcmd file://$DIR/${files[i]}
echo "Wallpaper set to ${files[i]}"
for i in ${!timing[@]}; do # Loop through the wallpapers
if [ ${timing[$i]} -gt $hour ]; then
$setcmd$DIR/${files[i-1]}
echo "Wallpaper set to ${files[i-1]}"
exit
fi
done
# Fallback at last wallpaper if time is not relevant
$setcmd file://$DIR/${files[7]}
$setcmd$DIR/${files[7]}
echo "Wallpaper set to ${files[7]}"