Bug fix: Camera import plugin
authorColin Clark <colin.clark@cclark.uk>
Tue, 22 Mar 2022 10:51:51 +0000 (10:51 +0000)
committerColin Clark <colin.clark@cclark.uk>
Tue, 22 Mar 2022 10:51:51 +0000 (10:51 +0000)
Fix coding errors.

plugins/camera-import/geeqie-camera-import

index 7dd131a..86ca6cc 100755 (executable)
@@ -94,8 +94,8 @@ then
        exit 0
 fi
 
-src_files_sorted=$(mktemp -d "${TMPDIR:-/tmp}/geeqie.XXXXXXXXXX")
-dest_files_sorted=$(mktemp -d "${TMPDIR:-/tmp}/geeqie.XXXXXXXXXX")
+src_files_sorted=$(mktemp "${TMPDIR:-/tmp}/geeqie.XXXXXXXXXX")
+dest_files_sorted=$(mktemp "${TMPDIR:-/tmp}/geeqie.XXXXXXXXXX")
 
 (
        gphoto2 --port "$port" --list-files 2> /tmp/geeqie-camera-import.log | awk '/#/ {print $2}' | sort > "$src_files_sorted"
@@ -109,7 +109,7 @@ then
        exit 1
 fi
 
-find . -maxdepth 1 -type f | sort > "$dest_files_sorted"
+find . -maxdepth 1 -type f -exec basename {} \; | sort > "$dest_files_sorted"
 existing_file_count=$(comm -12 "$src_files_sorted" "$dest_files_sorted" | wc -l)
 
 repeated=$(uniq --repeated "$src_files_sorted")