Mercurial > geeqie.yaz
changeset 1646:70277ff12cfc
fixed regexp usage
| author | nadvornik |
|---|---|
| date | Fri, 19 Jun 2009 22:37:30 +0000 |
| parents | 8efd65465de5 |
| children | 24360823aa6a |
| files | plugins/ufraw/geeqie-ufraw |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/ufraw/geeqie-ufraw Thu Jun 18 20:46:33 2009 +0000 +++ b/plugins/ufraw/geeqie-ufraw Fri Jun 19 22:37:30 2009 +0000 @@ -9,7 +9,7 @@ # matches raw file names, used as case insensitive -RAW_REGEX='.*\.\(arw\)\|\(srf\)\|\(sr2\)\|\(crw\)\|\(cr2\)\|\(kdc\)\|\(dcr\)\|\(k25\)\|\(raf\)\|\(mef\)\|\(mos\)\|\(mrw\)\|\(nef\)\|\(orf\)\|\(pef\)\|\(ptx\)\|\(dng\)\|\(x3f\)\|\(raw\)\|\(r3d\)\|\(3fr\)\|\(erf\)$' +RAW_REGEX='.*\.(arw|srf|sr2|crw|cr2|kdc|dcr|k25|raf|mef|mos|mrw|nef|orf|pef|ptx|dng|x3f|raw|r3d|3fr|erf)$' # matches ufraw id file names, used as case sensitive ID_REGEX='.*\.ufraw$' @@ -72,9 +72,9 @@ if [ "$count" -gt 0 ] ; then while read file; do [ -f "$file" ] || continue - if echo "$file"|grep -q -i "$RAW_REGEX" ; then + if echo "$file"|grep -E -q -i "$RAW_REGEX" ; then process_raw_file_default "$file" - elif echo "$file"|grep -q "$ID_REGEX" ; then + elif echo "$file"|grep -E -q "$ID_REGEX" ; then process_ufraw_id_file "$file" fi @@ -96,12 +96,12 @@ { list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` || exit 1 - find "$1" -iregex "$RAW_REGEX" -print | while read rawfile ; do + find "$1" -regextype posix-egrep -iregex "$RAW_REGEX" -print | while read rawfile ; do raw_file_not_processed "$rawfile" && echo "$rawfile" done >>$list #refresh output from changed id files - find "$1" -regex "$ID_REGEX" -print | while read idfile ; do + find "$1" -regextype posix-egrep -regex "$ID_REGEX" -print | while read idfile ; do id_file_changed "$idfile" && echo "$idfile" done >>$list