Use system-wide xsltproc in scripts
authorJoachim Breitner <mail@joachim-breitner.de>
Tue, 12 Jan 2010 18:45:25 +0000 (19:45 +0100)
committerJoachim Breitner <mail@joachim-breitner.de>
Tue, 13 Apr 2010 10:24:09 +0000 (12:24 +0200)
serna/dist/plugins/dita/map2htm.sh
serna/dist/plugins/dita/map2htm_merged.sh
serna/dist/plugins/dita/map2pdf_fop.sh
serna/dist/plugins/dita/map2pdf_xep.sh
serna/dist/utils/publishing/runXslt.sh

index 002222a..d20ddd8 100755 (executable)
@@ -4,7 +4,7 @@ if [[ "$OSTYPE" = darwin* ]]
 then
 $SERNA_DATA_DIR/MacOS/xsltproc --xinclude --param "FILEREF" "''" -o "$3" "$2" "$1"
 else
-$SERNA_DATA_DIR/bin/xsltproc --xinclude --param "FILEREF" "''" -o "$3" "$2" "$1"
+xsltproc --xinclude --param "FILEREF" "''" -o "$3" "$2" "$1"
 fi
 
 
index e77633f..b13c5dc 100755 (executable)
@@ -6,7 +6,7 @@ then
 $SERNA_DATA_DIR/MacOS/xsltproc --xinclude -o $temp "$2/topicmerge.xsl" "$1"
 $SERNA_DATA_DIR/MacOS/xsltproc --xinclude -o "$3" "$2/dita2html.xsl" $temp
 else
-$SERNA_DATA_DIR/bin/xsltproc --xinclude -o $temp "$2/topicmerge.xsl" "$1"
-$SERNA_DATA_DIR/bin/xsltproc --xinclude -o "$3" "$2/dita2html.xsl" $temp
+xsltproc --xinclude -o $temp "$2/topicmerge.xsl" "$1"
+xsltproc --xinclude -o "$3" "$2/dita2html.xsl" $temp
 fi
 rm -f $temp
index 7796ff7..63db52e 100755 (executable)
@@ -5,8 +5,8 @@ then
 $SERNA_DATA_DIR/MacOS/xsltproc --xinclude -o "temp_serna_map.xml" "$2/topicmerge.xsl" "$1"
 $SERNA_DATA_DIR/MacOS/xsltproc --xinclude -o "temp_serna_map.fo" "$2/dita2fo-shell.xsl" "temp_serna_map.xml"
 else
-$SERNA_DATA_DIR/bin/xsltproc --xinclude -o "temp_serna_map.xml" "$2/topicmerge.xsl" "$1"
-$SERNA_DATA_DIR/bin/xsltproc --xinclude -o "temp_serna_map.fo" "$2/dita2fo-shell.xsl" "temp_serna_map.xml"
+xsltproc --xinclude -o "temp_serna_map.xml" "$2/topicmerge.xsl" "$1"
+xsltproc --xinclude -o "temp_serna_map.fo" "$2/dita2fo-shell.xsl" "temp_serna_map.xml"
 fi
 fop.sh -fo "temp_serna_map.fo" -pdf "$3"
 rm temp_serna_map.xml
index 64844d0..68a6ad2 100755 (executable)
@@ -5,8 +5,8 @@ then
 $SERNA_DATA_DIR/MacOS/xsltproc --xinclude -o "temp_serna_map.xml" "$2/topicmerge.xsl" "$1"
 $SERNA_DATA_DIR/MacOS/xsltproc --xinclude -o "temp_serna_map.fo" "$2/dita2fo-shell.xsl" "temp_serna_map.xml"
 else
-$SERNA_DATA_DIR/bin/xsltproc --xinclude -o "temp_serna_map.xml" "$2/topicmerge.xsl" "$1"
-$SERNA_DATA_DIR/bin/xsltproc --xinclude -o "temp_serna_map.fo" "$2/dita2fo-shell.xsl" "temp_serna_map.xml"
+xsltproc --xinclude -o "temp_serna_map.xml" "$2/topicmerge.xsl" "$1"
+xsltproc --xinclude -o "temp_serna_map.fo" "$2/dita2fo-shell.xsl" "temp_serna_map.xml"
 fi
 xep.sh -fo "temp_serna_map.fo" -out "$3"
 rm temp_serna_map.xml
index 4086d47..7fc07df 100755 (executable)
@@ -1,4 +1,4 @@
 #!/bin/sh -x
 
-exec "$SERNA_DATA_DIR/bin/xsltproc" --xinclude -o \
+exec xsltproc --xinclude -o \
     "$SERNA_OUTPUT_FILE" "$SERNA_XSL_STYLESHEET" "$SERNA_XML_SRCFULLPATH"