[Squirrel-sql-commits] sql12/app/cmd squirrel-sql.sh, 1.19.2.1, 1.19.2.2

[Rob M. <man...@us...>]

Update of /cvsroot/squirrel-sql/sql12/app/cmd
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2496/app/cmd

Modified Files:
      Tag: squirrel_3_0_branch
	squirrel-sql.sh 
Log Message:
Merged from trunk(1.22): 2685144: Added check for minimum JVM version of 1.6.  This will work for any JVM version >= 1.2.2.  This will also inform the user which JVM was used to launch the application.

Index: squirrel-sql.sh
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/cmd/squirrel-sql.sh,v
retrieving revision 1.19.2.1
retrieving revision 1.19.2.2
diff -C2 -d -r1.19.2.1 -r1.19.2.2
*** squirrel-sql.sh	9 Mar 2009 01:45:16 -0000	1.19.2.1
--- squirrel-sql.sh	16 Mar 2009 22:13:33 -0000	1.19.2.2
***************
*** 31,34 ****
--- 31,40 ----
  cd "$UNIX_STYLE_HOME"
  
+ # Check to see if the JVM meets the minimum required to run SQuirreL
+ $JAVA -cp "$UNIX_STYLE_HOME/lib/versioncheck.jar" JavaVersionChecker 1.6 1.7
+ if [ "$?" = "1" ]; then
+   exit
+ fi
+ 
  # First entry in classpath is the Squirrel application.
  TMP_CP="$UNIX_STYLE_HOME/squirrel-sql.jar"