Be clear about this being a LEGACY thing

[picsort] / slurp-pics

diff --git a/slurp-pics b/slurp-pics
index 68a2b126e69e9e24f5d671fc745863f1c0c8650c..533c680f56cf1856778d3122277a8ed9f0b59b21 100755 (executable)
--- a/slurp-pics
+++ b/slurp-pics
@@ -1,12 +1,15 @@
 #!/bin/bash
 
 #!/bin/bash
 

+LEGACY='-oHostKeyAlgorithms=+ssh-dss'
+sftp=( sftp -v -P 19362 -i .slurp-key -oConnectTimeout=4 $LEGACY )
+

 while read host path;do
   outdir="slurp-$host"
   seendir="slurp-seen"
   {
     mkdir -p "$outdir" "$seendir/$outdir"
     echo "cd $path"
 while read host path;do
   outdir="slurp-$host"
   seendir="slurp-seen"
   {
     mkdir -p "$outdir" "$seendir/$outdir"
     echo "cd $path"

-    sftp -v -P 19362 -i .slurp-key -oConnectTimeout=4 "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}"
       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
           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
    for f in "$outdir"/*;do
      touch "$seendir/$f"
    done