From f4b37fbf3ba3282e51a35f978a1d8e10e292c49c Mon Sep 17 00:00:00 2001
From: tlrobinson <tom@280north.com>
Date: Fri, 13 Nov 2009 13:58:23 -0800
Subject: [PATCH] Add sudo to jake install. Add narwhal.local.conf. Remove tusk
 engine.

---
 Jakefile           |  2 +-
 bootstrap.sh       | 16 +++++++++-------
 narwhal.local.conf |  3 +++
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 narwhal.local.conf

diff --git a/Jakefile b/Jakefile
index b12465a83..5e2781b63 100644
--- a/Jakefile
+++ b/Jakefile
@@ -48,7 +48,7 @@ task ("install", ["CommonJS"], function()
 {
     // FIXME: require("narwhal/tusk/install").install({}, $COMMONJS);
     // Doesn't work due to some weird this.print business.
-    OS.system("tusk install --force " + $BUILD_CJS_OBJECTIVE_J + " " + $BUILD_CJS_CAPPUCCINO);
+    OS.system("sudo tusk install --force " + $BUILD_CJS_OBJECTIVE_J + " " + $BUILD_CJS_CAPPUCCINO);
 });
 
 // Documentation
diff --git a/bootstrap.sh b/bootstrap.sh
index 42b647687..32c1e6554 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -66,13 +66,13 @@ if [ `uname` = "Darwin" ]; then
         make webkit
         popd
         
-        echo "================================================================================"
-        echo "Rhino is the default Narwhal engine, should we change the default to JavaScriptCore for you?"
-        echo "This can by overridden by setting the NARWHAL_ENGINE environment variable to \"jsc\" or \"rhino\"."
-        echo "(Note: you must use Rhino for certain tools such as \"tusk\")"
-        if prompt; then
-            tusk engine jsc
-        fi
+        # echo "================================================================================"
+        # echo "Rhino is the default Narwhal engine, should we change the default to JavaScriptCore for you?"
+        # echo "This can by overridden by setting the NARWHAL_ENGINE environment variable to \"jsc\" or \"rhino\"."
+        # echo "(Note: you must use Rhino for certain tools such as \"tusk\")"
+        # if prompt; then
+        #     tusk engine jsc
+        # fi
     fi
 fi
 
@@ -108,3 +108,5 @@ if ! which -s "narwhal"; then
         path_instructions
     fi
 fi
+
+echo "Bootstrapping of Narwhal and other required tools is complete. You can now build Cappuccino."
diff --git a/narwhal.local.conf b/narwhal.local.conf
new file mode 100644
index 000000000..9fe4e691b
--- /dev/null
+++ b/narwhal.local.conf
@@ -0,0 +1,3 @@
+if [ -z "$NARWHAL_ENGINE" ] && [ -d "$NARWHAL_HOME/packages/narwhal-jsc" ]; then
+	export NARWHAL_ENGINE=jsc
+fi