You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2006/09/21 20:05:53 UTC
svn commit: r448617 - /db/derby/code/trunk/tools/jdbc4/update-with-jdbc4
Author: fuzzylogic
Date: Thu Sep 21 11:05:52 2006
New Revision: 448617
URL: http://svn.apache.org/viewvc?view=rev&rev=448617
Log:
DERBY-1846: Double up the backslashes for tr. Tested on bash and
tcsh on both Mac OS X and Linux, as well as Cygwin and MKS on Windows.
Modified:
db/derby/code/trunk/tools/jdbc4/update-with-jdbc4
Modified: db/derby/code/trunk/tools/jdbc4/update-with-jdbc4
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/tools/jdbc4/update-with-jdbc4?view=diff&rev=448617&r1=448616&r2=448617
==============================================================================
--- db/derby/code/trunk/tools/jdbc4/update-with-jdbc4 (original)
+++ db/derby/code/trunk/tools/jdbc4/update-with-jdbc4 Thu Sep 21 11:05:52 2006
@@ -85,7 +85,7 @@
echo "Compiling the client classes for JDBC 4.0"
for i in `cat client.list`
do
- FILE=`echo $i | tr '\\' '/'`
+ FILE=`echo $i | tr '\\\\' '/'`
if [ ! \( "$cygwin" = "true" \) -o \( "$mks" = "true" \) ]; then
FILE=`echo $FILE | sed 's/.$//g'`
fi
@@ -123,7 +123,7 @@
unset CLASSES
for i in `cat engine.list`
do
- FILE=`echo $i | tr '\\' '/'`
+ FILE=`echo $i | tr '\\\\' '/'`
if [ ! "$cygwin" = "true" ]; then
FILE=`echo $FILE | sed 's/.$//g'`
fi
@@ -143,9 +143,9 @@
# patch up modules.properties do the driver will load
cd "$DERBY_HOME/jdbc4classes/engine"
"$JAVA_HOME/bin/jar" xf "$DERBY_HOME_NML/lib/derby.jar" org/apache/derby/modules.properties
-if $cygwin; then
+if [ \( "$cygwin" = "true" \) -o \( "$mks" = "true" \) ]; then
cat "$THISDIR/modules.patch" >> "$DERBY_HOME/jdbc4classes/engine/org/apache/derby/modules.properties"
-elif [ ! "$cygwin" = "true" ]; then
+else
cat "$THISDIR/modules.patch" | sed 's/.$//g' >> "$DERBY_HOME/jdbc4classes/engine/org/apache/derby/modules.properties"
fi