From b6de182d781e69bb0e28f62d10c913911aa296c6 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Thu, 03 Dec 2020 07:41:32 +0000
Subject: [PATCH] Setup defaults
---
main.sh | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/main.sh b/main.sh
index 2ea58e1..b979730 100755
--- a/main.sh
+++ b/main.sh
@@ -3,7 +3,7 @@
TESTING=1
#Default variables
-SUBREDDITS=("EarthPorn")
+SUBREDDITS=("Wallpapers")
SORT=new
USER=$(whoami)
SIZE=1920x1080
@@ -41,9 +41,9 @@
done
#No Update to do
-#if [ -f $WALLDIR/json ] && [ "$(cat $WALLDIR/json)" == "$LATEST" ]; then
-# exit
-#fi
+if [ -f $WALLDIR/json ] && [ "$(cat $WALLDIR/json)" == "$LATEST" ]; then
+ exit
+fi
#Download image
url=$(echo $LATEST | jq ".data.children[-1].data.url" | sed 's/"//g')
@@ -59,8 +59,8 @@
#Add image title
if [ $WRITE_TITLE == 1 ]; then
- convert "temp.$ext" -fill "$TITLE_COLOR" -gravity "$TITLE_POSITION" -pointsize "$TITLE_SIZE" -annotate 0 "$title" -resize $SIZE "wallpaper.jpg"
+ convert "$WALLDIR/temp.$ext" -fill "$TITLE_COLOR" -gravity "$TITLE_POSITION" -pointsize "$TITLE_SIZE" -annotate 0 "$title" "$WALLDIR/wallpaper.jpg"
else
- convert "temp.$ext" -resize $SIZE "wallpaper.jpg"
+ convert "$WALLDIR/temp.$ext" "$WALLDIR/wallpaper.jpg"
fi
-rm temp.$ext
+rm $WALLDIR/temp.$ext
--
Gitblit v1.10.0