components/beanshell/patches/bsh.patch
author Stacey Marshall <Stacey.Marshall@Oracle.COM>
Tue, 22 Nov 2011 15:50:39 +0000
branchs11-sru
changeset 2232 b6ff38462fbe
parent 261 f7fc4962fa91
permissions -rw-r--r--
7112581 Problem with network/dns
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
261
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     1
--- beanshell-2.0b4/scripts/bsh	Fri Oct 19 14:54:14 2007
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     2
+++ beanshell-2.0b4/scripts/bsh.new	Tue May 10 17:13:29 2011
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     3
@@ -10,11 +10,28 @@
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     4
 # always be used.
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     5
 #
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     6
 
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     7
+help()
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     8
+{
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
     9
+cat << EOF
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    10
+  BeanShell, a small and embeddable Java source interpreter
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    11
+  Usage:
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    12
+  beansh | beanshell [ -g ] [Beanshell Script....]
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    13
+        -g		: beanshell graphics mode
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    14
+        -h or --help	: this manual
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    15
+
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    16
+EOF
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    17
+}
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    18
+
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    19
+if [ "$1" = "-h" -o "$1" = "--help" ]; then
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    20
+	help
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    21
+	exit;
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    22
+fi
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    23
+
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    24
 # The (hard coded) location of a default bsh jar.
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    25
 # e.g. Win
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    26
 #DEFAULTBSH=`cygpath --windows $HOME/pkg/bsh-1.3a1.jar`
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    27
 # e.g. Unix
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    28
-DEFAULTBSH=/home/pat/bin/bsh-1.3a1.jar
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    29
+DEFAULTBSH=/usr/share/lib/java/bsh-2.0b4.jar
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    30
 
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    31
 name=`basename $0`
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    32
 if [ $name = "bshd" ]; then
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    33
@@ -54,6 +71,10 @@
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    34
 		path=${DEFAULTBSH}
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    35
 	fi
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    36
 
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    37
-	java $debug -classpath $path bsh.Interpreter $* 
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    38
+	if [ "$1" = "-g" ]; then
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    39
+		java $debug -classpath $path bsh.Console
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    40
+	else
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    41
+		java $debug -classpath $path bsh.Interpreter $*
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    42
+	fi
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    43
 fi
f7fc4962fa91 7045306 migrate beanshell to userland
Kevin Crowe <Kevin.Crowe@oracle.com>
parents:
diff changeset
    44