trailing slash in output dir

diff --git a/duckduckget.sh b/duckduckget.sh
index 17c50dcd2f35ad307ad7682ed9b60385784396af..b24a2fbeaa78bc90d84387b717b3325a5726d46f 100755 (executable)
--- a/duckduckget.sh
+++ b/duckduckget.sh
@@ -3,13 +3,24 @@
 # get urls from duckduckgo, then parse them to wget to download
 
 args=("$@")
 # get urls from duckduckgo, then parse them to wget to download
 
 args=("$@")

-search=${args[0]}
+site=${args[0]}

 filetype=${args[1]}
 filetype=${args[1]}

+outdir=${args[2]}

 
 

-set -f
-urls=`curl -silent https://duckduckgo.com/html/\?q\=site:www.mash.dept.shef.ac.uk/Resources | 
-grep 'pdf$' | tr -d ' \t\r' | grep -v '^[0-9]' | awk '{print "http://" $0}'`
+if [ $# != 3 ]
+       then
+               printf  "\n\x1b[31mWrong number of arguments\x1b[0m\n\n"
+               printf "Usage: duckduckget [site] [filetype] [outdir]\n       where [site] is the domain to search for files\n             [filetype] is extension without preceeding dot\n             [outputdir] is the output directory relative to working directory"
+               exit 1
+fi
+
+if ! [[ $outdir =~ /$ ]]
+       then
+               $outdir=$outdir/
+fi
+
+urls=`curl -silent https://duckduckgo.com/html/\?q\=site:$site%20filetype:$filetype | grep "${filetype}$" | tr -d ' \t\r' | grep -v '^[0-9]' | awk '{print "http://" $0}'`

 
 for url in $urls; do
 
 for url in $urls; do

-       wget --cut-dirs=100 -P /mnt/andrew/literature/mathcentre/ $url
+       wget --cut-dirs=100 -P $outdir $url

 done
 done