Changeset a160d86 for common/common-functions

Timestamp:

06/20/2006 09:14:44 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

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

Children:

ddde18e

Parents:

c044e3c

Message:

Extensive code changes. A different method for finding the tarball name.

File:

• common/common-functions (modified) (3 diffs)

common/common-functions

@@ -684 +684 @@
   local IFS line URL1 URL2 FILE BOOKMD5 MD5 HAVEMD5 fromARCHIVE
 
+  # ALWAYS create a list of the full filenames
+  create_package_list
+
     # Test if the packages must be downloaded
   [ ! "$GETPKG" = "1" ] && return
@@ -799 +802 @@
     RUNMAKE=0
   fi
+}
+
+#----------------------------#
+create_package_list() {      #
+#----------------------------#
+
+  # Create the packages file. We need it for proper Makefile creation
+  echo -n "Creating <${PROGNAME}> list of tarball names for $BOOK $ARCH"
+  case ${PROGNAME} in
+    clfs)
+        xsltproc --nonet \
+                 --xinclude \
+                 -o pkg_tarball_list packages.xsl $BOOK/${ARCH}-index.xml
+      ;;
+    hlfs | lfs )
+        xsltproc --nonet \
+                 --xinclude \
+                 -o pkg_tarball_list packages.xsl $BOOK/index.xml
+      ;;
+  esac
+  echo " ...OK"
+
 }
 
@@ -837 +862 @@
   cd $BUILDDIR/sources
 }
+
+
+#----------------------------#
+get_package_tarball_name() { #
+#----------------------------#
+  local script_name=$1
+
+   # The use of 'head' is necessary to limit the return value to the FIRST match..
+   # hopefully this will not cause problems.
+   #
+   case $script_name in
+     tcl)   echo $(grep "^tcl" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;;
+     *)     echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 ) ;;
+   esac
+
+}