From d9679d54b95cb6e2d9dea9c3d8550355007531c8 Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Wed, 25 Nov 2015 00:43:04 -0500
Subject: Finish import script.

---
 import/photobox_import2.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/import/photobox_import2.sh b/import/photobox_import2.sh
index d49a356..050154a 100755
--- a/import/photobox_import2.sh
+++ b/import/photobox_import2.sh
@@ -23,21 +23,31 @@ readonly pending_path="$(make_unique $pending_root/$(date +%Y-%m-%d))"
 
 (
     flock -x -w 120 200 || exit 1
+    if [[ $input != *Kingston* ]]; then
+      echo "Not on the SD card reader: $input"
+      exit 1
+    fi
+    if [[ -z $(find "$input" -type f -print -quit | head) ]]; then
+      echo "No files found. Exiting."
+      umount $input
+      exit 0
+    fi
+
     mkdir -p "$backup_path"
     rsync -Hvax "$input/." "$backup_path/."
     echo "Contents backed up to: $backup_path"
 
     if [[ -d "$backup_path/DCIM" && \
-          -n $(find "$backup_path/DCIM" -iregex "$photoregex" -print -quit) ]]; then
-        "Found photos"
+          -n $(find "$backup_path/DCIM" -iregex "$photoregex" -print -quit | head) ]]; then
+        echo "Found photos"
         mkdir -p "${pending_path}.importing"
         rsync -avx "$backup_path"/DCIM/*/* "${pending_path}.importing/"
         mv "${pending_path}.importing" "${pending_path}"
         echo "Photos written to ${pending_path}"
     fi
 
-    "Deleting original files"
+    echo "Deleting original files"
     # Prevents 'rm -rf /'
-    rm -r "/media/$(basename $input)/*"
+    rm -r "/media/$(basename $input)"
     umount "${input}"
 ) 200>/tmp/photobox_import2.lock | systemd-cat -t photobox_import
-- 
cgit v1.2.3