docs-common/bin fdp-functions,1.7,1.8

[Tommy Reynolds (jtr)]

Author: jtr

Update of /cvs/docs/docs-common/bin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23685

Modified Files:
	fdp-functions 
Log Message:
1) Make "${FDPDIR}" into an absolute pathname to allow the fdpsh
   cd(1) command to be useful.
2) Added the fdpsh command "prettyprint foo.xml" as a wrapper to the
   current xmlformat tool.  I used a different name to avoid
   overloading the current name.  To much trouble to parse another
   "-f /path/to/config" argument ;-)
3) Borked the definition of ${RPMINFO} until we get the RPM packaging
   fixed again.



Index: fdp-functions
===================================================================
RCS file: /cvs/docs/docs-common/bin/fdp-functions,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fdp-functions	3 Feb 2006 15:50:47 -0000	1.7
+++ fdp-functions	3 Feb 2006 17:55:39 -0000	1.8
@@ -6,14 +6,24 @@
 
 
 FDPDIR=${FDPDIR:-".."}
+
+# Convert ${FDPDIR} into an absolute pathname if needed
+case "${FDPDIR}" in
+/*	)
+	;;
+*	)
+	FDPDIR=${PWD}/${FDPDIR}
+	;;
+esac
+
 FDPBINDIR="${FDPDIR}/docs-common/bin"
 FDPPKGDIR="${FDPDIR}/docs-common/packaging"
-RPMINFO=${RPMINFO:-"rpm-info.xml"}
+# NOTE TO PAUL: This is not a happy solution to defining ${RPMINFO}
+RPMINFO=${RPMINFO:-"rpm-info-${LANG}.xml"}
 XSLTPROC=${XSLTPROC:-xsltproc}
 XMLFORMAT=${XMLFORMAT:-"${FDPBINDIR}/xmlformat"}
 XMLFOPTS=${XMLFOPTS:-"-f ${FDPBINDIR}/xmlformat-fdp.conf"}
 
-
 get_all_workers()
 {
 	# Return list of workers, in format "email:wholename"
@@ -89,10 +99,14 @@
 	if [ $# -ne 1 ]; then
 		echo "usage: apply_po filename.xml">&2
 	fi
-	POFILE=`/bin/basename "$1" .xml`.po
+	POFILE=`/usr/bin/dirname "$1"`/`/bin/basename "$1" .xml`.po
 	if [ ! -f "${POFILE}" ]; then
 		echo "apply_po: file '${POFILE}' not found." >&2
 		return 1
 	fi
 	po2xml "$1" "${POFILE}"
 }
+
+prettyprint()	{
+	${XMLFORMAT} ${XMLFOPTS} $@
+}