diff options
-rwxr-xr-x | copyPhotos | 40 |
1 files changed, 16 insertions, 24 deletions
@@ -201,31 +201,23 @@ do "") break ;; - "f:"*|"k:"*|"m:"*|"fk:"*|"kf:"*|"mk:"*|"km:"*|"mf:"*|"fm:"*|"kmf:"*|"kfm:"*|"mkf:"*|"fkm:"*|"mfk:"*|"fmk:"*) + *":"*) + printf '%s\n' "${s}" \ + | grep -qi '^[kfm]\+:' \ + || continue re="${s#*:}" - case "${s%%:*}" in - 'f') - wen='Friedrich' - ;; - 'k') - wen='Kasimir' - ;; - 'm') - wen='Miranda' - ;; - 'fk'|'kf') - wen='Friedrich und Kasimir' - ;; - 'fm'|'mf') - wen='Friedrich und Miranda' - ;; - 'km'|'mk') - wen='Kasimir und Miranda' - ;; - 'fkm'|'fmk'|'kfm'|'mfk'|'kmf'|'mkf') - wen='Friedrich, Kasimir und Miranda' - ;; - esac + wen='' + for wer in 'k:Kasimir' 'f:Friedrich' 'm:Miranda'; do + printf '%s\n' "${s%%:*}" \ + | grep -qF "${wer%:*}" \ + && wen="${wen}${wen:+, }${wer#*:}" + done + wen=$( + printf '%s\n' "${wen}" \ + | sed ' + s@, \(\S\+\)$@ und \1@ + ' + ) bild="$( echo "${!daten[@]}" | \ tr ' ' '\n' | \ |