Update of /cvsroot/refdb/refdb/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5692/scripts
Modified Files:
Tag: Release_0_9_5_stable
refdbxml.in
Log Message:
run cygpath only for non-nil filenames
Index: refdbxml.in
===================================================================
RCS file: /cvsroot/refdb/refdb/scripts/refdbxml.in,v
retrieving revision 1.12.2.6
retrieving revision 1.12.2.7
diff -u -U2 -r1.12.2.6 -r1.12.2.7
--- refdbxml.in 22 Jun 2005 20:18:52 -0000 1.12.2.6
+++ refdbxml.in 8 Apr 2006 21:30:21 -0000 1.12.2.7
@@ -266,10 +266,18 @@
# the variables $jfosheet and jhtmlsheet will receive the appropriate paths
if [ $OSTYPE = "cygwin" ]; then
- # get the full dos path of the classpath root
- osclasspath_root=$(cygpath -w $classpath_root)
- classpath="$osclasspath_root\avalon-framework.jar;$osclasspath_root\batik.jar;$osclasspath_root\fop.jar;$osclasspath_root\jfor.jar;$osclasspath_root\jimi-1.0.jar;$osclasspath_root\logkit.jar;$osclasspath_root\sax.jar;$osclasspath_root\xalan.jar;$osclasspath_root\xerces.jar;$osclasspath_root\xp.jar;$osclasspath_root\xt.jar"
- jfosheet=$(cygpath -w $fosheet)
- jhtmlsheet=$(cygpath -w $htmlsheet)
- jxhtmlsheet=$(cygpath -w $xhtmlsheet)
+ if [ ! "X$classpath_root" = "X" ]; then
+ # get the full dos path of the classpath root
+ osclasspath_root=$(cygpath -w $classpath_root)
+ classpath="$osclasspath_root\avalon-framework.jar;$osclasspath_root\batik.jar;$osclasspath_root\fop.jar;$osclasspath_root\jfor.jar;$osclasspath_root\jimi-1.0.jar;$osclasspath_root\logkit.jar;$osclasspath_root\sax.jar;$osclasspath_root\xalan.jar;$osclasspath_root\xerces.jar;$osclasspath_root\xp.jar;$osclasspath_root\xt.jar"
+ fi
+ if [ ! "X$fosheet" = "X" ]; then
+ jfosheet=$(cygpath -w $fosheet)
+ fi
+ if [ ! "X$htmlsheet" = "X" ]; then
+ jhtmlsheet=$(cygpath -w $htmlsheet)
+ fi
+ if [ ! "X$xhtmlsheet" = "X" ]; then
+ jxhtmlsheet=$(cygpath -w $xhtmlsheet)
+ fi
else
classpath="$classpath_root/avalon-framework.jar:$classpath_root/batik.jar:$classpath_root/fop.jar:$classpath_root/jfor.jar:$classpath_root/jimi-1.0.jar:$classpath_root/logkit.jar:$classpath_root/sax.jar:$classpath_root/saxon.jar:$classpath_root/saxon-fop.jar:$classpath_root/saxon-jdom.jar:$classpath_root/xalan.jar:$classpath_root/xerces.jar:$classpath_root/xp.jar:$classpath_root/xt.jar"
@@ -291,7 +299,7 @@
if [ $OSTYPE = "cygwin" ]; then
# get the full dos path of the file
- mypath=$(cygpath -w $filename)
+ mypath=$(cygpath -w $filename)
else
- mypath=$filename
+ mypath=$filename
fi
|
