Cleanup of shell scripts, change shebang to bash, etc

Objective-J/Tools/executable

@@ -1,32 +1,20 @@
-#!/bin/sh
+#!/bin/bash
 
-# if OBJJ_HOME isn't set, try to determine it out
-#if [ -z $OBJJ_HOME ]; then
-    # get path of the executable
-    SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0")
-    
-    # resolve symlinks
-    if [ -h $SELF_PATH ]; then
-        SELF_PATH=`readlink $SELF_PATH`
-    fi
-    
-    # get second ancestor directory
-    SELF_DIR=`dirname $SELF_PATH`
-    export OBJJ_HOME=`dirname $SELF_DIR`
-    
-    # check to ensure it exists, print message
-#    if [ -d $OBJJ_HOME ]; then
-#        echo "OBJJ_HOME not set, defaulting to $OBJJ_HOME" 1>&2
-#    else
-#        echo "OBJJ_HOME not set, default at $OBJJ_HOME doesn't exist, exiting" 1>&2 
-#        exit 2
-#    fi
-#fi
+# get path of the executable
+SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0")
 
+# resolve symlinks
+if [ -h $SELF_PATH ]; then
+    SELF_PATH=`readlink $SELF_PATH`
+fi
+
+SELF_DIR=`dirname $SELF_PATH`
+OBJJ_HOME=`dirname $SELF_DIR`
 OBJJ_LIB="$OBJJ_HOME/lib"
-CLASSPATH="$OBJJ_LIB:$OBJJ_LIB/js.jar:$OBJJ_HOME/lib/$(basename $SELF_PATH):$CLASSPATH"
 
-OBJJ="$OBJJ_LIB/objj.js"
+CLASSPATH_TMP="$OBJJ_LIB:$OBJJ_LIB/js.jar:$OBJJ_HOME/lib/$(basename $SELF_PATH)"
+
+#OBJJ="$OBJJ_LIB/objj.js"
 RLWRAP=`which rlwrap`
 
 # if there's a "lib" directory, add all the jars from it
@@ -38,16 +26,14 @@ fi
 # convert paths for Cygwin
 if [[ `uname` == CYGWIN* ]]; then
     OBJJ_HOME=`cygpath -wp "$OBJJ_HOME"`
-    OBJJ_LIB=`cygpath -wp "$OBJJ_LIB"`
-    OBJJ=`cygpath -wp "$OBJJ"`
-    CLASSPATH=`cygpath -wp "$CLASSPATH"`
+    #OBJJ=`cygpath -wp "$OBJJ"`
+    CLASSPATH_TMP=`cygpath -wp "$CLASSPATH_TMP"`
+	CLASSPATH="$CLASSPATH_TMP;$CLASSPATH"
+else	
+	CLASSPATH="$CLASSPATH_TMP:$CLASSPATH"
 fi
 
-export OBJJ_LIB
-echo $RLWRAP java -classpath $CLASSPATH main $@
-#if [ -e $STEAM_BUILD/Objective-J.build/Release/Rhino ]; then
-    $RLWRAP java -classpath $CLASSPATH main $@
-    #$RLWRAP java -classpath $CLASSPATH org.mozilla.javascript.tools.shell.Main $OBJJ $@
-#else
-#    echo "Missing frameworks at $STEAM_BUILD/Objective-J.build/Release/Rhino" 1>&2
-#fi
+export OBJJ_HOME
+
+$RLWRAP java -cp $CLASSPATH main $@
+#$RLWRAP java -cp $CLASSPATH org.mozilla.javascript.tools.shell.Main $OBJJ $@

Objective-J/Tools/objj/main.js

@@ -2,22 +2,25 @@ debug = false;
 args = arguments;
 
 // FIXME: remove these Rhino/Java dependencies
-/*
-var OBJJ_LIB = Packages.java.lang.System.getenv("OBJJ_LIB"); // chicken/egg problem, getenv is defined in bridge.js
 
+var OBJJ_HOME = Packages.java.lang.System.getenv("OBJJ_HOME"); // chicken/egg problem, getenv is defined in bridge.js
+
+/*
 if (!this.window)
 {
     print("Loading Objective-J bridge.");
-    load(OBJJ_LIB+'/bridge.js');
+    load(OBJJ_HOME+'/lib/bridge.js');
 }
 
 if (!this.objj_import)
 {
     print("Loading Objective-J.");
-    load(OBJJ_LIB+'/Frameworks-Rhino/Objective-J/Objective-J.js');
+    load(OBJJ_HOME+'/lib/Frameworks-Rhino/Objective-J/Objective-J.js');
 }
 */
 
+OBJJ_INCLUDE_PATHS = [OBJJ_HOME+"/lib/Frameworks"];
+
 var OBJJ_INCLUDE_PATHS_STRING = getenv("OBJJ_INCLUDE_PATHS");
 
 if (OBJJ_INCLUDE_PATHS_STRING)
@@ -36,7 +39,7 @@ try
         while (args.length && args[0].indexOf('-I') === 0)
             OBJJ_INCLUDE_PATHS = args.shift().substr(2).split(':').concat(OBJJ_INCLUDE_PATHS);
     }
-
+    
     if (args.length > 0)
     {
         // Grab the location of the objj file to run.

Rake/lib/objj-executable

@@ -1,36 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 
-# if OBJJ_HOME isn't set, try to determine it
-#if [ -z $OBJJ_HOME ]; then
-    # get path of the executable
-    SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0")
-    
-    # resolve symlinks
-    if [ -h $SELF_PATH ]; then
-        SELF_PATH=`readlink $SELF_PATH`
-    fi
-    
-    # get second ancestor directory
-    SELF_DIR=`dirname $SELF_PATH`
-    export OBJJ_HOME=`dirname $SELF_DIR`
-    
-    # check to ensure it exists, print message
-#    if [ -d $OBJJ_HOME ]; then
-#        echo "OBJJ_HOME not set, defaulting to $OBJJ_HOME" 1>&2
-#    else
-#        echo "OBJJ_HOME not set, default at $OBJJ_HOME doesn't exist, exiting" 1>&2 
-#        exit 2
-#    fi
-#fi
+# get path of the executable
+SELF_PATH=$(cd -P -- "$(dirname -- "$0")" && pwd -P) && SELF_PATH=$SELF_PATH/$(basename -- "$0")
 
-OBJJ_LIB="$OBJJ_HOME/lib"
-FRAMEWORKS="$OBJJ_HOME/lib/Frameworks"
-MAIN="$OBJJ_LIB/$(basename $SELF_PATH)/main.j"
+# resolve symlinks
+if [ -h $SELF_PATH ]; then
+	SELF_PATH=`readlink $SELF_PATH`
+fi
+
+SELF_DIR=`dirname $SELF_PATH`
+SELF_HOME=`dirname $SELF_DIR`
+SELF_LIB="$SELF_HOME/lib"
+
+FRAMEWORKS="$SELF_LIB/Frameworks"
+MAIN="$SELF_LIB/$(basename $SELF_PATH)/main.j"
 
 # convert paths for Cygwin
 if [[ `uname` == CYGWIN* ]]; then
-    OBJJ_HOME=`cygpath -w "$OBJJ_HOME"`
-    BAKE=`cygpath -w "$BLEND"`
+    FRAMEWORKS=`cygpath -w "$FRAMEWORKS"`
+    MAIN=`cygpath -w "$MAIN"`
 fi
 
 objj -I$FRAMEWORKS $MAIN $@

Tools/Utilities/bridge.js

@@ -178,7 +178,9 @@ function serviceTimeouts()
 
 if (!this.load)
 {
-    alert("Setting up 'load()'");
+	if (debug)
+    	alert("Setting up 'load()'");
+
     this.load = function(path)
     {
         var contents = readFile(path);
@@ -195,7 +197,9 @@ if (!this.readFile)
 {
     if (this.File)
     {
-        alert("Setting up 'readFile()' for SpiderMonkey");
+		if (debug)
+        	alert("Setting up 'readFile()' for SpiderMonkey");
+
         this.readFile = function(path)
         {
         	var f = new File(path);
@@ -222,7 +226,9 @@ if (!this.readFile)
     }
     else if (this.Packages)
     {
-        alert("Setting up 'readFile()' for Rhino");
+		if (debug)
+        	alert("Setting up 'readFile()' for Rhino");
+
         this.readFile = function(path, characterCoding)
         {
         	var f = new Packages.java.io.File(path);
@@ -267,7 +273,8 @@ function bytesToHexString(buf)
 
 // Rhino utilities
 if (this.Packages) {
-    alert("Setting up Rhino utilties");
+	if (debug)
+    	alert("Setting up Rhino utilties");
 
     jsArrayToJavaArray = function(js_array, type)
     {