pre-modification commit

2 files changed, 13 insertions, 18 deletions

diff --git a/.scripts/4chget b/.scripts/4chget
index 41fd446..d0752ed 100755
--- a/.scripts/4chget
+++ b/.scripts/4chget
@@ -1,7 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 
+rootpapesdir="$HOME/pix/wallpaper/4chget"
+file $rootpapesdir || mkdir $rootpapesdir
 echo "Welcome to 4chan web/image scrapping script"
-#echo -e "What would you like to do?\r\n1)sync from phone to pc 2)sync from pc to phone "
 echo "Is it wallpaper/general (wg) or anime wallpaper (w)?"
 read option
 echo "Enter folder name:"
@@ -9,16 +10,16 @@ read dir
 echo "Enter thread no.: (#######)"
 read thread
 if [[ $option = w ]] ; then
- 	mkdir -p /home/$USER/Pictures/Wallpaper/4chget/w/$dir
+ 	mkdir -p "$rootpapesdir"/w/"$dir"
 else
-	mkdir -p /home/$USER/Pictures/Wallpaper/4chget/wg/$dir
+	mkdir -p "$rootpapesdir"/wg/"$dir"
 fi
 
 case "$option" in
 	"wg")
-		wget -P Pictures/Wallpaper/4chget/wg/$dir -nd -r -l 1 -H -D i.4cdn.org,is2.4chan.org -A png,jpg,jpeg -R '?????????????s.*' https://boards.4chan.org/wg/thread/$thread ;;
+		wget -P Pictures/Wallpaper/4chget/wg/"$dir" -nd -r -l 1 -H -D i.4cdn.org,is2.4chan.org -A png,jpg,jpeg -R '?????????????s.*' https://boards.4chan.org/wg/thread/"$thread" ;;
 
 	"w")
-		wget -P Pictures/Wallpaper/4chget/w/$dir -nd -r -l 1 -H -D i.4cdn.org,is2.4chan.org -A png,jpg,jpeg -R '?????????????s.*' https://boards.4channel.org/w/thread/$thread ;;
+		wget -P "$rootpapesdir"/w/"$dir" -nd -r -l 1 -H -D i.4cdn.org,is2.4chan.org -A png,jpg,jpeg -R '?????????????s.*' https://boards.4channel.org/w/thread/"$thread" ;;
 esac
 
diff --git a/.scripts/4chgetw b/.scripts/4chgetw
index a82f92a..cc6232a 100755
--- a/.scripts/4chgetw
+++ b/.scripts/4chgetw
@@ -1,25 +1,19 @@
 #!/bin/bash
 
-rootpixloc=$(echo "/home/saumit/pix/wallpaper/4chget")
+rootpixloc="$HOME/pix/wallpaper/4chget"
 option=$(echo -e "wg\nw" | dmenu -p "Is it wallpaper/general (wg) or anime wallpaper (w)?")
 dir=$(echo "" | dmenu -p "Enter folder name")    
 threadopt=$(echo -e "Yes\nNo" | dmenu -p "Do you have the thread link in your clipboard?")
 
-[ $threadopt == "Yes" ] && thread=$(xclip -o|xargs -I % echo %|cut -d\/ -f6) || thread=$(echo "" | dmenu -p "Enter thread no.: (#######)") &&
+[ "$threadopt" == "Yes" ] && thread=$(xclip -o|xargs -I % echo %|cut -d\/ -f6) || thread=$(echo "" | dmenu -p "Enter thread no.: (#######)") &&
 
-if [[ $option = w ]] ; then
-        mkdir -p $rootpixloc/w/$dir
+if [[ "$option" = w ]] ; then
+        mkdir -p "$rootpixloc"/w/"$dir"
     else
-        mkdir -p $rootpixloc/wg/$dir
+        mkdir -p "$rootpixloc"/wg/"$dir"
 fi
 
-case "$option" in
-        "wg")
-                wget -P $rootpixloc/wg/$dir -nd -r -l 1 -H -D i.4cdn.org,is2.4chan.org -A png,jpg,jpeg -R '?????????????s.*' https://boards.4chan.org/wg/thread/$thread ;;
-
-        "w")
-                 wget -P $rootpixloc/w/$dir -nd -r -l 1 -H -D i.4cdn.org,is2.4chan.org -A png,jpg,jpeg -R '?????????????s.*' https://boards.4channel.org/w/thread/$thread ;;
- esac
+wget -P "$rootpixloc"/"$option"/"$dir" -nd -r -l 1 -H -D i.4cdn.org,is2.4chan.org -A png,jpg,jpeg -R '?????????????s.*' https://boards.4chan.org/wg/thread/"$thread"
 
 viewopt=$(echo -e "Yes\nNo" | dmenu -p "Would you like to view the images?")
 endir=$rootpixloc\/$option\/$dir