Rmoved trash.sh.

[scripts.git] / archivepics.sh

diff --git a/archivepics.sh b/archivepics.sh
index afaf5d4..40ad62d 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
@@ -39,7 +47,7 @@ fi
 
 for i in "$@"; do
 
-    if [[ ! -f ${i/JPG/MOV} ]]; then
+    if [[ ! -f ${i/JPG/MOV} ]] && [[ ! -f ${i/JPG/3gp} ]]; then
 
         if [[ $(stat --printf=%s $i) -lt ${archive_size_min} ]]; then
             echo "Image $i is too small."
@@ -54,7 +62,13 @@ done
 
 for i in "$@"; do
 
-    ref=${i/MOV/JPG}
+    base=${i/%.???/}
+
+    if [[ -f ${base}.JPG ]]; then ref=${base}.JPG; fi
+    if [[ -f ${base}.jpg ]]; then ref=${base}.jpg; fi
+    if [[ -f ${base}.jpeg ]]; then ref=${base}.jpeg; fi
+
+    # echo "ref=${ref}"
 
     if [[ -f ${ref} ]]; then