|
Line
Link Here
|
| 0 |
-- fop |
0 |
++ fop |
|
Lines 137-143
Link Here
|
| 137 |
fi |
137 |
fi |
| 138 |
fi |
138 |
fi |
| 139 |
|
139 |
|
| 140 |
if [ ! -x "$JAVACMD" ] ; then |
140 |
# bnc#467866 fop fails if JAVACMD_OPTS is set |
|
|
141 |
if [ ! -x "`echo $JAVACMD | cut -d ' ' -f 1`" ] ; then |
| 141 |
echo "Error: JAVA_HOME is not defined correctly." |
142 |
echo "Error: JAVA_HOME is not defined correctly." |
| 142 |
echo " We cannot execute $JAVACMD" |
143 |
echo " We cannot execute $JAVACMD" |
| 143 |
exit 1 |
144 |
exit 1 |
|
Lines 247-253
Link Here
|
| 247 |
|
248 |
|
| 248 |
# Execute FOP using eval/exec to preserve spaces in paths, |
249 |
# Execute FOP using eval/exec to preserve spaces in paths, |
| 249 |
# java options, and FOP args |
250 |
# java options, and FOP args |
| 250 |
fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args" |
251 |
fop_exec_command="exec $JAVACMD $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args" |
| 251 |
if $fop_exec_debug ; then |
252 |
if $fop_exec_debug ; then |
| 252 |
echo $fop_exec_command |
253 |
echo $fop_exec_command |
| 253 |
fi |
254 |
fi |