Reposition text and URL

Change-Id: I24d7ac275421916fd9471e629de3bbc0cce4c94d

BUG=chrome-os-partner:803
TEST=none

Review URL: http://codereview.chromium.org/3302005

scripts/bitmaps/make_bmp_images.sh

@@ -83,16 +83,16 @@ function process_one_file {
   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"
@@ -110,5 +110,6 @@ for file in originals/*.gif; do
 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" *)

scripts/bitmaps/originals/DeveloperBmp.txt

@@ -1,2 +1,21 @@
 This copy of Chrome OS is untrusted. Press SPACE to begin recovery.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://google.com/chromeos/recovery
 $URL
+

scripts/bitmaps/originals/RecoveryBmp.txt

@@ -1,2 +1,20 @@
 Please remove all USB and SD devices to begin recovery.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://google.com/chromeos/recovery
 $URL

scripts/bitmaps/originals/RecoveryMissingOSBmp.txt

@@ -1,2 +1,20 @@
 Chrome OS is missing or damaged. Please connect a recovery device.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://google.com/chromeos/recovery
 $URL

scripts/bitmaps/originals/RecoveryNoOSBmp.txt

@@ -1,2 +1,20 @@
 The device you inserted does not contain Chrome OS. Try another?
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+http://google.com/chromeos/recovery
 $URL