projects
/
geeqie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3ffa1b2
)
Bug fix: Camera import plugin
author
Colin Clark
<colin.clark@cclark.uk>
Tue, 22 Mar 2022 10:51:51 +0000
(10:51 +0000)
committer
Colin 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
patch
|
blob
|
history
diff --git
a/plugins/camera-import/geeqie-camera-import
b/plugins/camera-import/geeqie-camera-import
index
7dd131a
..
86ca6cc
100755
(executable)
--- a/
plugins/camera-import/geeqie-camera-import
+++ b/
plugins/camera-import/geeqie-camera-import
@@
-94,8
+94,8
@@
then
exit 0
fi
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"
(
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
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")
existing_file_count=$(comm -12 "$src_files_sorted" "$dest_files_sorted" | wc -l)
repeated=$(uniq --repeated "$src_files_sorted")