[sword-svn] r206 - trunk/modules/calvinscommentaries

[lukeplant at crosswire.org]

Author: lukeplant
Date: 2009-05-12 05:52:00 -0700 (Tue, 12 May 2009)
New Revision: 206

Modified:
   trunk/modules/calvinscommentaries/bundle_and_install.sh
Log:
Updated for Sword > 1.5.9


Modified: trunk/modules/calvinscommentaries/bundle_and_install.sh
===================================================================
--- trunk/modules/calvinscommentaries/bundle_and_install.sh	2009-05-12 12:38:12 UTC (rev 205)
+++ trunk/modules/calvinscommentaries/bundle_and_install.sh	2009-05-12 12:52:00 UTC (rev 206)
@@ -121,16 +121,9 @@
 	# clean out old stuff
 	rm -f "$OSIS2MODOUTPUT/*"
 
-	# Bug in osis2mod 1.5.9 -- it removes all whitespace either side
-	# of a newline, so if a sentence has a newline in it, words end
-	# up merged together.  Fix that below:
-
-	tr '\n' ' ' < "$COMBINED" > "$COMBINED.2"
-	mv "$COMBINED.2" "$COMBINED"
-
 	# osis2mod
 	echo "Running osis2mod..."
-	osis2mod "$OSIS2MODOUTPUT" "$BUILDDIR/$COMBINED" 0 2 3 || exit 1
+	osis2mod "$OSIS2MODOUTPUT" "$BUILDDIR/$COMBINED" -z -b 3 || exit 1
 }
 
 function do_zip {