From 9570e541d933061ccd8cfc726fb1faafeaf683bb Mon Sep 17 00:00:00 2001
From: Derek Hammer <derek.r.hammer@gmail.com>
Date: Fri, 9 Sep 2011 11:41:01 -0500
Subject: [PATCH] Move OJTest install to after the tusk install of other
 packages.

Tusk seems to need OJTest to be alone in order to calculate and/or
download dependencies (which are the Objective-J and Cappuccino
pre-built packages).
---
 bootstrap.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 8857e4bde..845d5e38c 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -288,7 +288,7 @@ fi
 
 if [ ! "$install_test" ]; then
     echo "================================================================================"
-    echo "Would you like to install test OJTest package?"
+    echo "Would you like to install test OJTest package (this will also install the pre-build packages)?"
     if prompt; then
       install_test="yes"
     fi
@@ -309,10 +309,6 @@ 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
@@ -322,6 +318,11 @@ fi
 
 tusk $tusk_install_command browserjs jake shrinksafe $extra_packages
 
+if [ "$install_test" ]; then
+    echo "Installing OJTest from GitHub"
+    NARWHAL_ENGINE=rhino tusk install https://www.github.com/cappuccino/OJTest/zipball/latest
+fi
+
 if [ `uname` = "Darwin" ]; then
     echo "================================================================================"
     echo "Would you like to install the JavaScriptCore engine for Narwhal?"