Changeset cf9cac8

Timestamp:

01/10/2006 03:40:18 AM (18 years ago)

Author:

Jeremy Huntwork <jhuntwork@…>

Branches:

1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

7b20cc5

Parents:

3d82fb5

Message:

Fix handling of groff's special patch format. Also, only find the md5sum of the exact package we're downloading, not a spurious copy that has, say, a '.1' or '.2' at the end of the file.

File:

• jhalfs (modified) (4 diffs)

jhalfs

@@ -233 +233 @@
   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|>||' `
+  sed -i 's|&groff-patchlevel;|'$GROFFLEVEL'|' patches
+
   # Done. Moving on...
   echo -ne "done\n"
@@ -249 +254 @@
 
   # Find the md5 sum for this package.
-  if [ $2 != MD5SUMS ] ; then MD5=`grep "  $2" MD5SUMS` ; fi
+  if [ $2 != MD5SUMS ] ; then MD5=`grep "  $2$" MD5SUMS` ; fi
 
   if [ ! -f $2 ] ; then
@@ -307 +312 @@
     for i in `cat $JHALFSDIR/packages` ; do
       PKG=`echo $i | sed -e 's/-version.*//' -e 's/-file.*//'`
-      # Needed for Groff patchlevel patch
-      GROFFLEVEL=`grep "groff-patchlevel" $JHALFSDIR/packages | sed -e 's/groff-patchlevel //' -e 's/"//g'`
 
       # There are some entities that aren't valid packages.
@@ -314 +317 @@
 
       VRS=`echo $i | sed -e 's/.* //' -e 's/"//g'`
-      if [ "$PKG" = "tcl" ] ; then
-        FILE="$PKG$VRS-src.tar.bz2"
-      elif [ "$PKG" = "vim-lang" ] ; then
-        PKG="vim"
-        FILE="vim-$VRS-lang.tar.bz2"
-      elif [ "$PKG" = "udev-config" ] ; then
-        PKG="udev"
-        FILE="$VRS"
-      else
-        FILE="$PKG-$VRS.tar.bz2"
-      fi
+      case $PKG in 
+        tcl)
+               FILE="$PKG$VRS-src.tar.bz2"
+               ;;
+        vim-lang)
+               PKG="vim"
+               FILE="vim-$VRS-lang.tar.bz2"
+               ;;
+        udev-config)
+               PKG="udev"
+               FILE="$VRS"
+               ;;
+        *)
+               FILE="$PKG-$VRS.tar.bz2"
+               ;;
+      esac
       download $PKG $FILE
-      for patch in `grep "$PKG-&$PKG" $JHALFSDIR/patches` ; do
+
+      # Download any associated patches
+      for patch in `grep "&$PKG-version" $JHALFSDIR/patches` ; do
         PATCH=`echo $patch | sed 's@&'$PKG'-version;@'$VRS'@'`
-        download $PKG $PATCH
-      done
-      # Needed for Groff patchlevel patch
-      for patch in `grep "patchlevel" $JHALFSDIR/patches` ; do
-        PATCH=`echo $patch | sed 's@&'$PKG'-version;-&'$PKG'-patchlevel;@'$VRS'-'$GROFFLEVEL'@'`
         download $PKG $PATCH
       done