diff --git a/rootfs/home/andre/.bashrc b/rootfs/home/andre/.bashrc index 65c70f6..fd69297 100644 --- a/rootfs/home/andre/.bashrc +++ b/rootfs/home/andre/.bashrc @@ -251,8 +251,7 @@ Funktionen arg_help svncom screen_h sudo_h iptables_h ssh_h init.d_h delete_files_older logrotate rotate ssh_perconal_environment ssh_personal_config eping - sysinfo pw update_git AddTimeDateToPanasonicPictures - my_versions prompt_confirm conv_owi + sysinfo pw update_git my_versions prompt_confirm conv_owi wetter zeigt Wettervorhersagen an @@ -397,10 +396,19 @@ AddTimeDateToPictures () { if [ "$MONTH" == "11" ]; then MONTH="November"; fi if [ "$MONTH" == "12" ]; then MONTH="Dezember"; fi - # zusammengesetzer datums-, zeitstring in bild einfügen (mittig oben) - convert $J -gravity North -pointsize $FS -font Courier-Bold -fill red -undercolor black -annotate +0+0 "Datum $DAY. $MONTH $YEAR Zeit $TIME" $J; - FS2=$(bc -l <<< "$FS+25" | awk -F. '{print $1}') - convert $J -gravity North -pointsize $FS -font Courier-Bold -fill red -undercolor black -annotate +0+$FS2 "Position $POSITION" $J; + + + if [[ $J =~ ^[a-z0-9]+_[a-z0-9.]+_[0-9]+\.jpg$ ]]; then + FS2=$(bc -l <<< "$FS+25" | awk -F. '{print $1}') + convert $J -gravity South -pointsize $FS -font Courier-Bold -fill red -undercolor black -annotate +0+$FS2 "Position $POSITION" $J; + mv "$J" "I${J##*_}" + else + # zusammengesetzer datums-, zeitstring in bild einfügen (mittig oben) + convert $J -gravity North -pointsize $FS -font Courier-Bold -fill red -undercolor black -annotate +0+0 "Datum $DAY. $MONTH $YEAR Zeit $TIME" $J; + FS2=$(bc -l <<< "$FS+25" | awk -F. '{print $1}') + convert $J -gravity North -pointsize $FS -font Courier-Bold -fill red -undercolor black -annotate +0+$FS2 "Position $POSITION" $J; + fi + }