X-Git-Url: http://git.scottworley.com/picsort/blobdiff_plain/20f5e5b6d7a268119d2b4794d892b7d384bb0ad7..b8d031015ec55eacf050f89592925a2488d5d4ba:/slurp-pics?ds=inline

diff --git a/slurp-pics b/slurp-pics
index 9602c3f..0dd4e78 100755
--- a/slurp-pics
+++ b/slurp-pics
@@ -1,12 +1,15 @@
 #!/bin/bash
 
+LEGACY='-oHostKeyAlgorithms=+ssh-dss'
+sftp=( sftp -v -P 19362 -i .slurp-key -oConnectTimeout=4 $LEGACY )
+
+seendir="slurp-seen"
 while read host path;do
-  outdir="slurp-$host"
-  seendir="slurp-seen"
+  outdir="slurp-$host-${path//\//,}"
   {
     mkdir -p "$outdir" "$seendir/$outdir"
     echo "cd $path"
-    sftp -v -P 19362 -i .slurp-key "slurp@$host" <<< "cd $path"$'\n'"ls -1" |
+    "${sftp[@]}" "slurp@$host" <<< "cd $path"$'\n'"ls -1" |
       sed 1,2d |
       while read filename;do
         output_filename="$outdir/${filename/jpg/jpeg}"
@@ -17,7 +20,7 @@ while read host path;do
           echo "get -p $filename $output_filename"
         fi
       done
-   } | sftp -v -P 19362 -i .slurp-key "slurp@$host"
+   } | "${sftp[@]}" "slurp@$host"
    for f in "$outdir"/*;do
      touch "$seendir/$f"
    done