diff options
| author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-02-23 21:13:16 -0500 |
|---|---|---|
| committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2016-02-23 21:13:16 -0500 |
| commit | 53fa8f2eeece0ab0758fc2d8ee0941253a519bae (patch) | |
| tree | 0f986d26f67ea0f538e6bb91953e8d31d92dbcc9 | |
| parent | 8d3d2bcb4491c854592b90e3e404a4b44396190c (diff) | |
Update to the photobox_import script.
| -rwxr-xr-x | import/photobox_import.sh | 12 |
1 files 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 |