Reposition text and URL

scripts/bitmaps/make_bmp_images.sh

 #!/bin/bash -e
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # This adds text to our non-labeled recovery images.
 #
 # The source images should be 1366x800, with the expectation they'll be cropped
 # to 1366x768 or 1280x800, have 2 lines of text overlayed at the bottom, and
 # then be resized to 800x600 so that the BIOS can then display them stretched
@@ skipping 65 matching lines @@
   # Now crop that to the two target sizes
   convert "$img_orig" -gravity Center \
     -crop "$geom_crop_a"+0+0 +repage "$img_crop_a"
   convert "$img_orig" -gravity Center \
     -crop "$geom_crop_b"+0+0 +repage "$img_crop_b"
 
   # Add the labels in
   if [ -r "$txt_file" ]; then
     # Replace all '$URL' in the URL in the text file with the real url
     perl -p \
-      -e 'BEGIN {$/ = ""; $url = shift; }' \
-      -e 'chomp; s/\$URL/$url/gse;' \
-      -e 'END {print "\n";}' "$url" "$txt_file" > "$label_file"
+      -e 'BEGIN {$/ = undef; $url = shift; }' \
+      -e 's/\s+$/\n/gs; s/\$URL/$url/gs;' \
+      "$url" "$txt_file" > "$label_file"
     # Render it
     convert "$img_crop_a" -fill white \
       -font "$font" -pointsize "$pointsize" -interline-spacing 5 \
-      -gravity south -annotate '+0+10' '@'"$label_file" "$img_txt_a"
+      -gravity south -annotate '+0+0' '@'"$label_file" "$img_txt_a"
     convert "$img_crop_b" -fill white \
       -font "$font" -pointsize "$pointsize" -interline-spacing 5 \
-      -gravity south -annotate '+0+10' '@'"$label_file" "$img_txt_b"
+      -gravity south -annotate '+0+0' '@'"$label_file" "$img_txt_b"
   else
     mv "$img_crop_a" "$img_txt_a"
     mv "$img_crop_b" "$img_txt_b"
   fi
 
   # Now scale the result to the final size
   convert "$img_txt_a" -scale "$geom_final" -alpha off "$dst_img_a"
   convert "$img_txt_b" -scale "$geom_final" -alpha off "$dst_img_b"
 }
 
 
 # Do it.
 for file in originals/*.gif; do
   process_one_file "$file"
 done
 
 # Zip up the bitmaps
-(cd "$outdir_a" && zip -qr "${thisdir}/out_${geom_crop_a}.zip" *)
-(cd "$outdir_b" && zip -qr "${thisdir}/out_${geom_crop_b}.zip" *)
+nicename=${url// /_}
+(cd "$outdir_a" && zip -qr "${thisdir}/out_${nicename}__${geom_crop_a}.zip" *)
+(cd "$outdir_b" && zip -qr "${thisdir}/out_${nicename}__${geom_crop_b}.zip" *)