From aec1e3e329b0828a8615529ccb9f6a941457b70b Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Tue, 24 Nov 2015 23:52:10 -0500
Subject: Remove dry-run.

---
 import/photobox_import2.sh | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/import/photobox_import2.sh b/import/photobox_import2.sh
index c84d752..d49a356 100755
--- a/import/photobox_import2.sh
+++ b/import/photobox_import2.sh
@@ -26,19 +26,18 @@ readonly pending_path="$(make_unique $pending_root/$(date +%Y-%m-%d))"
     mkdir -p "$backup_path"
     rsync -Hvax "$input/." "$backup_path/."
     echo "Contents backed up to: $backup_path"
-    echo "pending_path: $pending_path"
 
     if [[ -d "$backup_path/DCIM" && \
           -n $(find "$backup_path/DCIM" -iregex "$photoregex" -print -quit) ]]; then
-        echo "Found photos"
-        echo mkdir -p "${pending_path}.importing"
-        echo rsync -avx "$backup_path"/DCIM/*/* "${pending_path}.importing/"
-        echo mv "${pending_path}.importing" "${pending_path}"
+        "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
 
-    echo "Deleting original files"
+    "Deleting original files"
     # Prevents 'rm -rf /'
-    echo rm -rf /media/"$(basename $input)"
-    rsync -Hvax --remove-source-files "$input/." "$backup_path/."
-    echo umount "${input}"
+    rm -r "/media/$(basename $input)/*"
+    umount "${input}"
 ) 200>/tmp/photobox_import2.lock | systemd-cat -t photobox_import
-- 
cgit v1.2.3