Changeset 61c0e64

Timestamp:

Feb 21, 2006, 12:16:32 AM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

9b5d6cdc

Parents:

99e4712

Message:

r568@server (orig r566): ryan | 2005-06-09 08:36:17 -0700
Several changes

• Handle tar.Z files (use zcat)
• add a -no-remove option to unpack_tarball and fix the OK message to display the tarball name, not ${1}

File:

• scripts/funcs/tarball-funcs.sh (modified) (7 diffs)

scripts/funcs/tarball-funcs.sh

@@ -64 +64 @@
 
 fetch_tarball() { # ${1} should be a package name w version
-   for type in tar.bz2 tar.gz tgz tar bleh; do
+   for type in tar.bz2 tar.gz tgz tar.Z tar bleh; do
+      # if the following is true, we failed in our mission
+      if [ "${type}" = "bleh" ]; then return 1 ; fi
       fetch ${1}.${type}
       if [ "${?}" = "0" ]; then return 0 ; fi
-      # if the following is true, we failed in our mission
-      if [ "${type}" = "bleh" ]; then return 1 ; fi
    done
 }
@@ -76 +76 @@
    shift
    local filelist="${@}"
+
+   # Check if -no-remove option is set
+   echo ${filelist} | grep \\-no-remove > /dev/null 2>&1 &&
+   {
+      local no_remove=Y
+      filelist=`echo ${filelist} | sed 's@-no-remove@@g'`
+   }
+
    # Easier add of .tgz
 
@@ -88 +96 @@
    
    local archive=`ls -t ${TARBALLS}/${pkgname}* 2> /dev/null | \
-      ${GREP} -E ${pkgname}.\(tgz\|tar.gz\|tar.bz2\|tar\)$ | head -n 1`
+      ${GREP} -E ${pkgname}.\(tgz\|tar.gz\|tar.bz2\|tar.Z\|tar\)$ | head -n 1`
 
    if [ -z ${archive} ]; then
@@ -98 +106 @@
       *.gz | *.tgz )   local CAT="gzip -dc" ;;
       *.bz2 )          local CAT="bzcat"    ;;
-      *.tar )          local CAT="cat"    ;;
+      *.Z )            local CAT="zcat"     ;;
+      *.tar )          local CAT="cat"      ;;
       * )   echo "unpack_tarball: unable to determine tarball type... exiting"
             exit 1 ;;
@@ -126 +135 @@
       filelist=`echo ${filelist} | \
          sed "s@\([-+_a-zA-Z0-9/.]* \?\)@${PKGDIR}/\1@g"`
-   elif [ -d ${PKGDIR} ]; then
+   elif [ -d ${PKGDIR} -a ! "${no_remove}" = "Y" ]; then
       echo -n "Removing existing ${PKGDIR} directory... "
       rm -rf ${PKGDIR} && echo "DONE" || 
@@ -135 +144 @@
    echo "Unpacking ${archive}"
    ${CAT} ${archive} | tar -xf - ${filelist} 2> /dev/null &&
-   echo " o ${1} unpacked successfully" ||
+   echo " o ${archive} unpacked successfully" ||
    {
       echo "unpack_tarball: unable to unpack tarball ${archive}... exiting"
@@ -197 +206 @@
       #  2> /dev/null | head -n 1`
       local archive=`ls -t ${TARBALLS}/${pkgname}* 2> /dev/null | \
-      ${GREP} -E ${pkgname}.\(tgz\|tar.gz\|tar.bz2\|tar\)$ | head -n 1`
+      ${GREP} -E ${pkgname}.\(tgz\|tar.gz\|tar.bz2\|tar.Z\|tar\)$ | head -n 1`
 
       if [ -z "${archive}" ]; then