[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5941] trunk/sql12/app/src/main/java/net/ sourceforge/squirrel_sql/client/update/gui/installer/ClasspathFunctionFixer .java

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

Revision: 5941
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5941&view=rev
Author:   manningr
Date:     2010-10-30 18:02:59 +0000 (Sat, 30 Oct 2010)

Log Message:
-----------
Skip bash classpath function update for squirrel-sql.bat.

Modified Paths:
--------------
    trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/ClasspathFunctionFixer.java

Modified: trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/ClasspathFunctionFixer.java
===================================================================
--- trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/ClasspathFunctionFixer.java	2010-10-30 18:02:08 UTC (rev 5940)
+++ trunk/sql12/app/src/main/java/net/sourceforge/squirrel_sql/client/update/gui/installer/ClasspathFunctionFixer.java	2010-10-30 18:02:59 UTC (rev 5941)
@@ -36,13 +36,20 @@
 	
 	private boolean sawOpenCurlyBrace = false; 
 	
+	/**
+	 * @see net.sourceforge.squirrel_sql.fw.util.ScriptLineFixer#fixLine(java.lang.String, java.lang.String)
+	 */
 	@Override
-	public String fixLine(String line)
+	public String fixLine(String scriptFileName, String line)
 	{
 		if (scriptWasAlreadyFixed) {
 			return line;
 		}
-				
+		
+		if (!scriptFileName.toLowerCase().endsWith(".sh")) {
+			return line;
+		}
+		
 		if (line.contains("buildCPFromDir()")) {
 			inFunctionDeclaration = true;
 			return line;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.