Project Aon Git Repositories
/
project-aon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
counterfire -> return fire erratum
[project-aon.git]
/
common
/
scripts
/
gbtoxhtml-simple.pl
diff --git
a/common/scripts/gbtoxhtml-simple.pl
b/common/scripts/gbtoxhtml-simple.pl
index
fc1df53
..
09dc2a5
100755
(executable)
--- a/
common/scripts/gbtoxhtml-simple.pl
+++ b/
common/scripts/gbtoxhtml-simple.pl
@@
-18,7
+18,7
@@
unless( -e $RXP && -x $RXP ) {
# try somewhere else
$RXP = '/usr/local/bin/rxp';
}
# try somewhere else
$RXP = '/usr/local/bin/rxp';
}
-my $ZIP = '/usr/bin/zip
-q
';
+my $ZIP = '/usr/bin/zip';
my $JAVA = '/usr/bin/java';
# latest binary download names the relevant jar "xalan.jar"
# older installations may have "xalan2.jar"
my $JAVA = '/usr/bin/java';
# latest binary download names the relevant jar "xalan.jar"
# older installations may have "xalan2.jar"
@@
-28,6
+28,17
@@
unless( -e $XALAN_JAR ) {
$XALAN_JAR = '/usr/share/java/xalan2.jar';
}
$XALAN_JAR = '/usr/share/java/xalan2.jar';
}
+# Check that all the binaries are were want them
+
+my @BINARIES;
+push @BINARIES, ($RXP, $ZIP, $JAVA, $XALAN_JAR);
+
+foreach (@BINARIES) {
+ if ( ! -e $_ ) {
+ die "$PROGRAM_NAME: Cannot find binary '".$_."'. Please install it.\n";
+ }
+}
+
###
my $bookCode = '';
###
my $bookCode = '';
@@
-122,7
+133,7
@@
if( $bookXML =~ m{^([-\w\@./]+)$} ) {
my $bookPath = "$outPath${FILENAME_SEPARATOR}${bookCode}";
print qx{$JAVA -classpath "$XALAN_JAR" org.apache.xalan.xslt.Process -IN "${bookXML}" -XSL "${xhtmlXSL}" -OUT "${bookPath}.htm" -PARAM use-illustrators "$rulesHash{'use-illustrators'}"};
my $bookPath = "$outPath${FILENAME_SEPARATOR}${bookCode}";
print qx{$JAVA -classpath "$XALAN_JAR" org.apache.xalan.xslt.Process -IN "${bookXML}" -XSL "${xhtmlXSL}" -OUT "${bookPath}.htm" -PARAM use-illustrators "$rulesHash{'use-illustrators'}"};
- print qx{$ZIP $bookPath.zip $bookPath.htm};
+ print qx{$ZIP
-q
$bookPath.zip $bookPath.htm};
}
print "Success\n" if $verbose;
}
print "Success\n" if $verbose;