Move startup stuff to start()

[picsort] / slurp-pics

diff --git a/slurp-pics b/slurp-pics
index 9602c3f4b7b20d54d6f81c174edc386d752d74b1..8bbd7ca9e072c38f8f313220fefdb779b361d802 100755 (executable)
--- a/slurp-pics
+++ b/slurp-pics
@@ -1,12 +1,15 @@
-#!/bin/bash
+#!/usr/bin/env bash

 
 

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

 while read host path;do
 while read host path;do

-  outdir="slurp-$host"
-  seendir="slurp-seen"
+  outdir="slurp-$host-${path//\//,}"

   {
     mkdir -p "$outdir" "$seendir/$outdir"
     echo "cd $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}"
       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