From 6ed4b289d85d173c3f58b012cdbfde78430d7d12 Mon Sep 17 00:00:00 2001
From: Antoine Mercadal <antoine.mercadal@inframonde.eu>
Date: Mon, 17 Oct 2011 20:04:54 +0200
Subject: [PATCH] Fix bootstrap errors

running tusk install browserjs jake shrinksafe AND extra packages (OJtest, objj and capp)
in a single instruction prevent the installation of the lasts.
This patch splits the procedure in two separate instructions
---
 bootstrap.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/bootstrap.sh b/bootstrap.sh
index 8857e4bde..b0edadecb 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -279,7 +279,8 @@ fi
 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."
+    echo "If you intend to build Cappuccino yourself this is not neccessary. If you want to use "
+    echo "the master of Cappuccino, say NO, and when bootstrap will be finished, run \"jake install\""
     if prompt; then
       install_capp="yes"
     fi
@@ -320,7 +321,13 @@ if ! tusk update; then
     exit 1
 fi
 
-tusk $tusk_install_command browserjs jake shrinksafe $extra_packages
+
+tusk $tusk_install_command browserjs jake shrinksafe
+
+
+echo "Installing extra packages..."
+tusk $tusk_install_command $extra_packages
+
 
 if [ `uname` = "Darwin" ]; then
     echo "================================================================================"