Miscellaneous updates.

[scripts.git] / archivepics.sh

diff --git a/archivepics.sh b/archivepics.sh
index 202d73c..783effd 100755 (executable)
--- a/archivepics.sh
+++ b/archivepics.sh
@@ -28,6 +28,14 @@
 
 [[ ${archive_size_min} ]] || archive_size_min=1048576 # 1Mb
 
+# if [[ -z $* ]] && [[ ${PHO_NOTE_1} ]]; then
+    # echo "$0 ${PHO_NOTE_1}"
+    # $0 ${PHO_NOTE_1}
+    # exit 0
+# fi
+
+export ARCHIVED_PICS="$@"
+
 set -e
 
 if [[ ! ${IMAGE_ARCHIVE_DIR} ]]; then
@@ -41,7 +49,7 @@ for i in "$@"; do
 
     if [[ ! -f ${i/JPG/MOV} ]] && [[ ! -f ${i/JPG/3gp} ]]; then
 
-        if [[ $(stat --printf=%s $i) -lt ${archive_size_min} ]]; then
+        if [[ $(stat --printf=%s "$i") -lt ${archive_size_min} ]]; then
             echo "Image $i is too small."
             exit 1
         fi
@@ -60,16 +68,18 @@ for i in "$@"; do
     if [[ -f ${base}.jpg ]]; then ref=${base}.jpg; fi
     if [[ -f ${base}.jpeg ]]; then ref=${base}.jpeg; fi
 
-    echo "ref=${ref}"
+    # echo "ref=${ref}"
 
     if [[ -f ${ref} ]]; then
 
-        TAG=$(exif --ifd=EXIF -t "Date and Time (original)" ${ref} | grep Value)
+        echo "Checking ${ref} date"
+
+        TAG=$(exif --ifd=EXIF -t "Date and Time (original)" "${ref}" | grep Value)
 
         if [[ ${TAG} ]]; then
             TIMESTAMP=$(echo ${TAG} | sed -e \
                 "s/^ *Value: *\([0-9]*\):\([0-9]*\):\([0-9]*\) *\([0-9]*\):\([0-9]*\):\([0-9]*\).*$/\1\2\3\4\5.\6/")
-            touch -t $TIMESTAMP $i
+            touch -t $TIMESTAMP "$i"
         else
             echo "No exif tag in $i, can not set the date properly."
         fi
@@ -87,12 +97,12 @@ done
 
 for i in "$@"; do
 
-    ARCHIVING_PATH=$(ls -l --time-style=+%Y/%b --format=verbose $i | awk '{ print $6 }')
+    ARCHIVING_PATH=$(ls -l --time-style=+%Y/%b --format=verbose "$i" | awk '{ print $6 }')
 
     mkdir -p ${IMAGE_ARCHIVE_DIR}/${ARCHIVING_PATH}
 
-    echo "Archiving ${IMAGE_ARCHIVE_DIR}/${ARCHIVING_PATH}/$(basename $i)"
+    echo "Archiving ${IMAGE_ARCHIVE_DIR}/${ARCHIVING_PATH}/"$(basename "$i")
 
-    cp -p -i $i ${IMAGE_ARCHIVE_DIR}/${ARCHIVING_PATH}
+    cp -p -i "$i" ${IMAGE_ARCHIVE_DIR}/${ARCHIVING_PATH}
 
 done