From: Colin Clark <colin.clark@cclark.uk>
Date: Tue, 22 Mar 2022 10:51:51 +0000 (+0000)
Subject: Bug fix: Camera import plugin
X-Git-Tag: gtk2final~34
X-Git-Url: http://geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git;a=commitdiff_plain;h=abd5043a1227c1dd353f358d9b3a0e330c492e27

Bug fix: Camera import plugin

Fix coding errors.
---

diff --git a/plugins/camera-import/geeqie-camera-import b/plugins/camera-import/geeqie-camera-import
index 7dd131ab..86ca6ccf 100755
--- a/plugins/camera-import/geeqie-camera-import
+++ b/plugins/camera-import/geeqie-camera-import
@@ -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")