.scripts: Checking for valid option+directory existence check+regex fix(other tries failed)

1 files changed, 27 insertions, 6 deletions

diff --git a/.scripts/4chget b/.scripts/4chget
index 5921a22..091322b 100755
--- a/.scripts/4chget
+++ b/.scripts/4chget
@@ -1,23 +1,44 @@
 #!/bin/bash
 rootpapesdir="$HOME/pix/wallpaper/4chget"
-file $rootpapesdir || mkdir $rootpapesdir
+[ -d "$rootpapesdir" ] || mkdir "$rootpapesdir"
 echo "Welcome to 4chan web/image scrapping script"
 echo "Is it wallpaper/general (wg) or anime wallpaper (w)?"
 read option
+while [[ "$option" != "w" && "$option" != "wg" ]]; do
+    read -p "Please choose a valid option w or wg: " option
+done
 echo "Enter folder name:"
 read dir
 echo "Enter thread no.: (#######)"
 read thread
 if [[ $option = w ]] ; then
- 	mkdir -p "$rootpapesdir"/w/"$dir"
-else
-	mkdir -p "$rootpapesdir"/wg/"$dir"
+    while true; do
+        if [ -d "$rootpapesdir"/w/"$dir" ]; then
+            echo "Folder already exists. Please choose a different name:"
+            read dir
+        else
+            mkdir -p "$rootpapesdir"/w/"$dir"
+            echo "Folder '$dir' created successfully."
+            break
+        fi
+    done
+elif [[ $option = wg ]] ; then
+    while true; do
+        if [ -d "$rootpapesdir"/wg/"$dir" ]; then
+            echo "Folder already exists. Please choose a different name:"
+            read dir
+        else
+            mkdir -p "$rootpapesdir"/wg/"$dir"
+            echo "Folder '$dir' created successfully."
+            break
+        fi
+    done
 fi
 
 case "$option" in
 	"wg")
-		wget -P "$rootpapesdir"/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 "$rootpapesdir"/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 "$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" ;;
+		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