diff --git a/autodescribe b/autodescribe index 22d3e10..57f587f 100755 --- a/autodescribe +++ b/autodescribe @@ -1315,7 +1315,7 @@ comment_xcf () { sf="$(echo "$1" | sed 's/"/\\"/g')" # gimp's Scheme interpreter displays some logging info before and after the # desired output, so use sed to delete it to leave only XML. - METADATA=$(echo '((display "\nMETADATA-START\n") (let ((img (car (gimp-file-load RUN-NONINTERACTIVE "'"$sf"'" "file")))) (display (car (gimp-image-get-metadata img))) (gimp-image-delete img)) (gimp-quit TRUE))' | gimp -n -i -d -f -s -g /dev/null --stack-trace-mode=never -b - 2>/dev/null | sed -e '1,/^METADATA-START/d' -e '/<\/metadata>/q') + METADATA=$(echo '((display "\nMETADATA-START\n") (let ((img (car (gimp-file-load RUN-NONINTERACTIVE "'"$sf"'" "file")))) (display (car (gimp-image-get-metadata img))) (gimp-image-delete img)) (gimp-quit TRUE))' | gimp-console -n -i -c -d -f -s -g /dev/null --stack-trace-mode=never -b - 2>/dev/null | sed -e '1,/^METADATA-START/d' -e '/<\/metadata>/q') if [ -n "$METADATA" ]; then COMMENT=$(echo "$METADATA" | xmlstarlet sel -t -v '/metadata/tag[@name="Xmp.dc.title"]' | sed 's/lang="x-default" *//') fi diff --git a/automtime b/automtime index 29e5773..39bc563 100755 --- a/automtime +++ b/automtime @@ -887,7 +887,7 @@ mtime_xcf () { # generally a "save" event (which makes sense). # gimp's Scheme interpreter displays some logging info before and after the # desired output, so use sed to delete it to leave only XML. - METADATA=$(echo '((display "\nMETADATA-START\n") (let ((img (car (gimp-file-load RUN-NONINTERACTIVE "'"$sf"'" "file")))) (display (car (gimp-image-get-metadata img))) (gimp-image-delete img)) (gimp-quit TRUE))' | gimp -n -i -d -f -s -g /dev/null --stack-trace-mode=never -b - 2>/dev/null | sed -e '1,/^METADATA-START/d' -e '/<\/metadata>/q') + METADATA=$(echo '((display "\nMETADATA-START\n") (let ((img (car (gimp-file-load RUN-NONINTERACTIVE "'"$sf"'" "file")))) (display (car (gimp-image-get-metadata img))) (gimp-image-delete img)) (gimp-quit TRUE))' | gimp-console -n -i -c -d -f -s -g /dev/null --stack-trace-mode=never -b - 2>/dev/null | sed -e '1,/^METADATA-START/d' -e '/<\/metadata>/q') if [ -n "$METADATA" ]; then RAWTIME=$(echo "$METADATA" | xmlstarlet sel -t -v "/metadata/tag[starts-with(@name, 'Xmp.xmpMM.History[') and contains(@name, '/stEvt:when')]" | sed 's/lang="x-default" *//' | sort -d | tail -1) # $RAWTIME is like 2022-02-23T22:50:48-08:00