r2272 - jhalfs/trunk

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Mon Jan 9 19:58:23 PST 2006


Author: jhuntwork
Date: 2006-01-09 20:58:23 -0700 (Mon, 09 Jan 2006)
New Revision: 2272

Modified:
   jhalfs/trunk/jhalfs
Log:
Hackish fix. Only grab entities from lines that start with <!ENTITY.
Hopefully this means that this line isn't commented out.
Better fix forthcoming.



Modified: jhalfs/trunk/jhalfs
===================================================================
--- jhalfs/trunk/jhalfs	2006-01-10 03:40:18 UTC (rev 2271)
+++ jhalfs/trunk/jhalfs	2006-01-10 03:58:23 UTC (rev 2272)
@@ -230,11 +230,11 @@
   fi
   echo `grep "udev-config-file" $BOOK/general.ent | sed -e 's@<!ENTITY @@' -e 's@">@"@'` >> packages
   echo `grep "glibc" packages | sed 's at glibc@glibc-libidn@'` >> packages
-  grep "ENTITY" $BOOK/patches.ent | sed -e 's/.* "//' -e 's/">//' >> patches
+  grep "^<\!ENTITY" $BOOK/patches.ent | sed -e 's/.* "//' -e 's/">//' >> patches
 
   # Needed for Groff patchlevel patch
   GROFFLEVEL=`grep "groff-patchlevel" $BOOK/general.ent | sed -e 's/groff-patchlevel //' -e 's/"//g' \
-    -e 's@<!ENTITY @@' -e 's|>||' `
+    -e 's@<!ENTITY @@' -e 's|>||'`
   sed -i 's|&groff-patchlevel;|'$GROFFLEVEL'|' patches
 
   # Done. Moving on...




More information about the alfs-log mailing list