From 53fa8f2eeece0ab0758fc2d8ee0941253a519bae Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kjetil.orbekk@gmail.com>
Date: Tue, 23 Feb 2016 21:13:16 -0500
Subject: Update to the photobox_import script.

---
 import/photobox_import.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/import/photobox_import.sh b/import/photobox_import.sh
index 20b25ae..e94f8a0 100755
--- a/import/photobox_import.sh
+++ b/import/photobox_import.sh
@@ -1,18 +1,16 @@
 #!/bin/bash
-log() {
-  echo "$(date "+%b %d %H:%M:%S") photobox_import: $@" >> /var/log/photobox
-}
-
 readonly photoregex='.*\(jpg\|raf\|cr2\)'
-readonly target=$(mktemp -u /srv/photos/pending/$(date +%Y-%m-%d).XXX)
+readonly target=$(mktemp -u /btrfs/storage/photos-pending/$(date +%Y-%m-%d).XXX)
 
+(
 mnt=$(mktemp -d)
 mount "$DEVNAME" "$mnt"
 if [[ -d "$mnt/DCIM" && \
      -n $(find "$mnt/DCIM" -iregex "$photoregex" -print -quit) ]]; then
-  umask 000
   mkdir -p "$target.importing"
-  rsync -avx "$mnt"/DCIM/*/* "$target.importing/"
+  rsync -avx --remove-source-files "$mnt"/DCIM/*/* "$target.importing/"
+  chown -R orbekk "$target.importing"
   mv "$target.importing" "$target"
 fi
 umount "$mnt"
+) 2>&1 | systemd-cat -t photobox_import
-- 
cgit v1.2.3