From c5f37e665b004c6899faa8fa7e346fc811c8d19a Mon Sep 17 00:00:00 2001
From: Derek Hammer <derek.r.hammer@gmail.com>
Date: Tue, 31 May 2011 03:05:24 -0700
Subject: [PATCH 1/2] Adding OJTest installation to the bootstrap.sh file. Also
 added the cappuccino/objective-j packages back to the file.

---
 bootstrap.sh | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index dc035c0c9..4fc02a1c0 100644
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -140,6 +140,8 @@ while [ $# -gt 0 ]; do
         --github-user)  github_user="$2"; shift;;
         --github-ref)   github_ref="$2"; shift;;
         --install-capp) install_capp="yes";;
+        --install-test) install_test="yes";;
+        --install)      install_capp="yes"; install_test="yes";;
         *)              cat >&2 <<-EOT
 usage: ./bootstrap.sh [OPTIONS]
 
@@ -150,6 +152,8 @@ usage: ./bootstrap.sh [OPTIONS]
     --github-user [USER]:   Use another github user (default: 280north).
     --github-ref [REF]:     Use another git ref (default: master).
     --install-capp:         Install "objective-j" and "cappuccino" packages.
+    --install-test:         Install "ojtest" package.
+    --install               Install all packages.
 EOT
                         exit 1;;
     esac
@@ -272,12 +276,19 @@ if ! prompt "yes"; then
     exit 1
 fi
 
-# echo "================================================================================"
-# echo "Would you like to install the pre-built Objective-J and Cappuccino packages?"
-# echo "If you intend to build Cappuccino yourself this is not neccessary."
-# if [ ! "$install_capp" ] && prompt; then
-#     install_capp="yes"
-# fi
+if [ ! "$install_capp" ] && prompt; then
+    echo "================================================================================"
+    echo "Would you like to install the pre-built Objective-J and Cappuccino packages?"
+    echo "If you intend to build Cappuccino yourself this is not neccessary."
+    install_capp="yes"
+fi
+
+
+if [ ! "$install_test" ] && prompt; then
+    echo "================================================================================"
+    echo "Would you like to install test OJTest package?"
+    install_test="yes"
+fi
 
 # Make sure tusk can access GitHub's HTTPS URLs.
 NARWHAL_ENGINE=rhino js -e "javax.net.ssl.SSLContext.getDefault()" &> /dev/null
@@ -294,6 +305,10 @@ if [ "$install_capp" ]; then
     extra_packages="objective-j cappuccino"
 fi
 
+if [ "$install_test" ]; then
+    extra_packages="${extra_packages} https://github.com/280north/ojtest/zipball/latest"
+fi
+
 echo "Installing necessary packages..."
 
 if ! tusk update; then

From c5df9c973f45775ab1a1057e9a3e5cf749d0381b Mon Sep 17 00:00:00 2001
From: Derek Hammer <derek.r.hammer@gmail.com>
Date: Mon, 13 Jun 2011 21:48:02 -0700
Subject: [PATCH 2/2] Making the directions go before the prompt (doh!).
 Changing bootstrap to +x.

---
 bootstrap.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 bootstrap.sh

diff --git a/bootstrap.sh b/bootstrap.sh
old mode 100644
new mode 100755
index 4fc02a1c0..8857e4bde
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -276,18 +276,22 @@ if ! prompt "yes"; then
     exit 1
 fi
 
-if [ ! "$install_capp" ] && prompt; then
+if [ ! "$install_capp" ]; then
     echo "================================================================================"
     echo "Would you like to install the pre-built Objective-J and Cappuccino packages?"
     echo "If you intend to build Cappuccino yourself this is not neccessary."
-    install_capp="yes"
+    if prompt; then
+      install_capp="yes"
+    fi
 fi
 
 
-if [ ! "$install_test" ] && prompt; then
+if [ ! "$install_test" ]; then
     echo "================================================================================"
     echo "Would you like to install test OJTest package?"
-    install_test="yes"
+    if prompt; then
+      install_test="yes"
+    fi
 fi
 
 # Make sure tusk can access GitHub's HTTPS URLs.