Updated screenshot script

i3-snapshot

@@ -1,13 +1,14 @@
 #!/bin/sh
 
-DATE=(`date +%F`)
-COUNT=0
-FILENAME=~/Pictures/snapshot-${DATE}-${COUNT}.png
+DATE=$(date +'%Y/%m/%d')
+COUNT=1
+FILENAME=~/Pictures/Screenshots/${DATE}/${COUNT}.png
+mkdir -p "$(dirname "${FILENAME}")"
 
 until [[ ! -e $FILENAME ]]
 do
-    FILENAME=~/Pictures/snapshot-${DATE}-${COUNT}.png
-    COUNT=`expr ${COUNT} + 1`
+    FILENAME=~/Pictures/Screenshots/${DATE}/${COUNT}.png
+    COUNT=$(( COUNT + 1 ))
 done
 
 TYPE=root
@@ -32,7 +33,7 @@ do
 done
 
 if [[ $TYPE == "root" ]] ; then
-    import -window root ${FILENAME}
+    import -window root "${FILENAME}"
 else
-    import ${FILENAME}
+    import "${FILENAME}"
 fi