[Squirrel-sql-commits] sql12/app/cmd squirrel-sql.sh,1.14,1.15

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

Update of /cvsroot/squirrel-sql/sql12/app/cmd
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6403/app/cmd

Modified Files:
	squirrel-sql.sh 
Log Message:
Altered the classpath of the update app to prefer downloaded jars over the ones to be overwritten.  

Index: squirrel-sql.sh
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/app/cmd/squirrel-sql.sh,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** squirrel-sql.sh	5 Jul 2008 20:15:11 -0000	1.14
--- squirrel-sql.sh	27 Jul 2008 23:33:36 -0000	1.15
***************
*** 23,38 ****
  
  # Then add all library jars to the classpath.
- IFS=""
  for a in $UNIX_STYLE_HOME/lib/*; do
  	TMP_CP="$TMP_CP":"$a";
  done
  
  # Now add the system classpath to the classpath. If running
  # Cygwin we also need to change the classpath to Windows format.
  if $cygwin ; then
  	TMP_CP=`cygpath -w -p $TMP_CP`
  	TMP_CP=$TMP_CP';'$CLASSPATH
  else
  	TMP_CP=$TMP_CP:$CLASSPATH
  fi
  
--- 23,47 ----
  
  # Then add all library jars to the classpath.
  for a in $UNIX_STYLE_HOME/lib/*; do
  	TMP_CP="$TMP_CP":"$a";
  done
  
+ # Set the update app's classpath to use jars in download area first, then the installed jars
+ UPDATE_CP=$TMP_CP
+ for a in $UNIX_STYLE_HOME/update/downloads/core/*; do
+     UPDATE_CP="$a":"$UPDATE_CP"
+ done
+ 
+ 
  # Now add the system classpath to the classpath. If running
  # Cygwin we also need to change the classpath to Windows format.
  if $cygwin ; then
  	TMP_CP=`cygpath -w -p $TMP_CP`
+ 	UPDATE_CP=`cygpath -w -p $UPDATE_CP`
  	TMP_CP=$TMP_CP';'$CLASSPATH
+ 	UPDATE_CP=$UPDATE_CP';'$CLASSPATH
  else
  	TMP_CP=$TMP_CP:$CLASSPATH
+ 	UPDATE_CP=$UPDATE_CP:$CLASSPATH
  fi
  
***************
*** 44,48 ****
  
  # Check for updates and prompt to apply if any are available
! $JAVA -cp $TMP_CP -Dlog4j.defaultInitOverride=true -Dprompt=true net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchUpdateApplication -l $SQUIRREL_SQL_HOME/update-log4j.properties
  
  # Launch SQuirreL application
--- 53,57 ----
  
  # Check for updates and prompt to apply if any are available
! $JAVA -cp $UPDATE_CP -Dlog4j.defaultInitOverride=true -Dprompt=true net.sourceforge.squirrel_sql.client.update.gui.installer.PreLaunchUpdateApplication -l $SQUIRREL_SQL_HOME/update-log4j.properties
  
  # Launch SQuirreL application