debxo-sugar: update packages for squeeze

[xodist] / mkbootable.sh

diff --git a/mkbootable.sh b/mkbootable.sh
index e13452dcf55b202c840c5fce48e592cd5b5f3bd1..03cff0df98abc57842fdcb6513674804a11ab8ce 100755 (executable)
--- a/mkbootable.sh
+++ b/mkbootable.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # mkbootable.sh, make a bootable file set from a jffs2 image
 # Copyright © 2008  James Cameron <quozl@laptop.org>
@@ -33,7 +33,7 @@ IMAGE_DEFAULT=
 INTERACTIVE=yes
 OUTPUT=${IMAGE_DEFAULT}.bootable
 
-. functions.sh
+. ./functions.sh
 
 images()
 {
@@ -101,7 +101,7 @@ if ! test -d ${OUTPUT}; then
        mkdir ${OUTPUT}
 fi
 
-cp ${IMAGE}.{dat,crc,img} ${OUTPUT}
+cp ${IMAGE}.{dat,img} ${OUTPUT}
 
 mkdir -p ${OUTPUT}/boot
 
@@ -109,12 +109,14 @@ mkdir -p ${OUTPUT}/boot
 cat <<EOF >${OUTPUT}/boot/olpc.fth
 \ OLPC boot script
 
+visible
+clear-screen
 cr
-." This is a debxo bootable install script." cr
+." This is a xodist bootable install script for the OLPC XO-1." cr
 cr
-." `md5sum ${IMAGE}.img`" cr
-." `md5sum ${IMAGE}.dat`" cr
-." `md5sum ${IMAGE}.crc`" cr
+." Checksums:" cr
+."     `md5sum ${IMAGE}.img`" cr
+."     `md5sum ${IMAGE}.dat`" cr
 cr
 EOF
 
@@ -124,18 +126,20 @@ case $INTERACTIVE in
                cat <<EOF >>${OUTPUT}/boot/olpc.fth
 
 \ --no-interactive was used, so we do not prompt
-." Erasing everything here and installing debxo ${IMAGE}" cr
+." Erasing everything here and installing ${IMAGE}" cr
 EOF
                ;;
        yes|*)
                cat <<EOF >>${OUTPUT}/boot/olpc.fth
 
 \ --interactive was used, so we prompt before erasing
-." Power off to abort, or" cr
-." press Enter to erase everything here and install debxo ${IMAGE} ?"
-begin
-    key d =
-until
+." Type yes then enter to erase everything here and install ${IMAGE} ? "
+cursor-on
+key  lcc  dup emit  ascii y = not  [if] cr abort [then]
+key  lcc  dup emit  ascii e = not  [if] cr abort [then]
+key  lcc  dup emit  ascii s = not  [if] cr abort [then]
+key       dup emit  d       = not  [if] cr abort [then]
+
 EOF
                ;;
 esac