Moved images folder to new media home folder.

7 files changed, 8 insertions, 8 deletions

diff --git a/archSetup.sh b/archSetup.sh
index c058d2d..3d9e1ff 100755
--- a/archSetup.sh
+++ b/archSetup.sh
@@ -35,8 +35,8 @@ cd
 # Directory structure
 mkdir -p "$HOME/downloads/videos"
 mkdir -p "$HOME/downloads/audios"
-mkdir -p "$HOME/images/screenshots"
-mkdir -p "$HOME/images/wallpapers/shufs/current"
+mkdir -p "$HOME/media/images/screenshots"
+mkdir -p "$HOME/media/images/wallpapers/shufs/current"
 mkdir "$HOME/repos"
 
 # Connect to server
diff --git a/dmenuTerm.sh b/dmenuTerm.sh
index 9654649..a6d459c 100755
--- a/dmenuTerm.sh
+++ b/dmenuTerm.sh
@@ -14,7 +14,7 @@ case "$chosen" in
 	"years") ~/scripts/floats/floatYears.sh ;;
 	"months") ~/scripts/floats/floatMonths.sh ;;
 	"weather") urxvt -title floating -sh 10 -geometry 125x40 -e weather.sh ;;
-	"wp selection") ~/scripts/floats/floatWpBrowser.sh "$HOME/images/wallpapers/" ;;
+	"wp selection") ~/scripts/floats/floatWpBrowser.sh "$CONFIG_FOLDER_WP" ;;
 	"python") urxvt -title floating -geometry 80x28 -e python -q ;;
 	#programs
 	"cmus") urxvt -cd ~/music -e cmus ;;
diff --git a/floats/floatWpBrowser.sh b/floats/floatWpBrowser.sh
index cbfdee9..6cbcad6 100755
--- a/floats/floatWpBrowser.sh
+++ b/floats/floatWpBrowser.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 path="$1"
-[ -z "$path" ] && path="/home/taamas/images/wallpapers/"
+[ -z "$path" ] && path="$CONFIG_FOLDER_WP"
 urxvt -title floating -sh 20 -cr black -geometry "45x6-5-5" -e wpBrowser.sh "$path"
diff --git a/i3lock.sh b/i3lock.sh
index ee10a88..d311189 100755
--- a/i3lock.sh
+++ b/i3lock.sh
@@ -2,7 +2,7 @@
 
 # Generates an i3lock bg based on a screenshot.
 
-imgLock="$HOME/images/icons/lock.png"
+imgLock="$HOME/media/images/icons/lock.png"
 imgTemp="/tmp/i3lockss.png"
 imgFinal="/tmp/lockFinal$(date +"%H%M%S").png"
 maim -u "$imgTemp"
diff --git a/ripme.sh b/ripme.sh
index 10ac8b4..d36678b 100755
--- a/ripme.sh
+++ b/ripme.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 notify-send -t 1400 "Ripping $1..."
-java -jar "/home/taamas/programs/ripme.jar" -l "/home/taamas/images/rips" -u "$1" && dunstify "Finished ripping $1."
+java -jar "/home/taamas/programs/ripme.jar" -l "/home/taamas/media/images/rips" -u "$1" && dunstify "Finished ripping $1."
diff --git a/screenshot.sh b/screenshot.sh
index 0ae696a..90562a8 100755
--- a/screenshot.sh
+++ b/screenshot.sh
@@ -4,7 +4,7 @@
 
 borderColor="0.412,0.431,1"
 name="$(date +"%y%m%d_%H%M%S")".png
-file="$HOME/images/screenshots/${name}"
+file="${CONFIG_FOLDER_SCREENSHOTS}/${name}"
 
 # If secondary screen is connected take a screenshot of only it
 geometry=""
diff --git a/wallpaper/setRandomWP.sh b/wallpaper/setRandomWP.sh
index 218e68b..1c4bb3d 100755
--- a/wallpaper/setRandomWP.sh
+++ b/wallpaper/setRandomWP.sh
@@ -3,7 +3,7 @@
 # Sets a random image as wallpaper and soft-links it from home folder.
 
 wpsFolder="$CONFIG_FOLDER_RANDOMWP"
-[ -z "$wpsFolder" ] && dunstify '$CONFIG_FOLDER_RANDOMWP env variable not set.' && exit 0
+[ -z "$wpsFolder" ] && dunstify 'CONFIG_FOLDER_RANDOMWP env variable not set.' && exit 0
 [ ! -d "$wpsFolder" ] && dunstify "'$CONFIG_FOLDER_RANDOMWP' folder does not exist." && exit 0
 wpFile="$(find "$CONFIG_FOLDER_RANDOMWP" | shuf -n 1)"
 wpPointer.sh "$wpFile"