Merge stage1 x86_64 dans trunk

[hvlinux.git] / functions

diff --git a/functions b/functions
index 1fb9fa4..218df79 100644 (file)
--- a/functions
+++ b/functions
@@ -38,7 +38,7 @@ get_pkg_ver()
        return 1
     fi
 
-    echo ${1} | sed "s!.*-\(\([0-9]\.\)*\).*!\1!g" | sed 's!\.$!!g'
+    echo ${1} | sed "s!.*-\([0-9].*\)!\1!g"
 }
 
 # Extracting the base version number from a complete package name.
@@ -411,8 +411,8 @@ var_add_shadow()
 
     # Checking if variable contains the new value
     if egrep "^${VARIABLE}" ${FILE} | grep "${VALUE}" 1> /dev/null 2>&1; then
-       echo "variable ${VARIABLE} already contains value: ${VALUE}"
-       exit 0
+       echo "${FUNCNAME}(), variable ${VARIABLE} already contains value: ${VALUE}"
+       return 0
     fi
 
     # Adding new value to variable
@@ -529,9 +529,7 @@ apply_patches()
     if ls ${LFS_PKG_DIR}/${1}-*.patch 1> /dev/null 2>&1; then
        cd ${LFS_PKG_DIR}
        for patch in ${1}-*.patch; do
-           echo "******************************"
-           echo "* Applying patch: ${patch}"
-           echo "******************************"
+           echo "Applying patch: ${patch}:"
            patch -Np1 -d ${LFS_TMP}/${TARGET_DIR} -i ${LFS_PKG_DIR}/${patch} || exit 1
        done
     fi
@@ -576,15 +574,14 @@ decompress_package()
     elif [ $# -eq 2 ]; then
        local TOPDIR=${2}
     else
-       echo
-       echo "${FUNCNAME}(): Incorrect number of arguments (must be 1 or 2)"
+       echo "${FUNCNAME}(): Incorrect number of arguments (must be 1 or 2)" > /dev/stderr
        return ${EXIT_FAILURE}
     fi
 
     local PACKAGE=${1}
 
     if [ ! -f ${LFS_PKG_DIR}/${PACKAGE}.tar.bz2 ]; then
-       echo "${FUNCNAME}(): Missing source package: \"${PACKAGE}.tar.bz2\""
+       echo "${FUNCNAME}(): Missing source package: \"${PACKAGE}.tar.bz2\"" > /dev/stderr
        return ${EXIT_FAILURE}
     fi
     
@@ -768,7 +765,8 @@ static_ipkg()
     echo "------------------------" 1>> ${LFS_LOG_FILE}
     echo "Installing" ${LABEL} 1>> ${LFS_LOG_FILE}
 
-    decompress_package ${PACKAGE_NAME} 1>> ${PACKAGE_LOG} 2>&1
+    echo "Decompressing package" 1>> ${PACKAGE_LOG} 2>&1 &&
+    decompress_package ${PACKAGE_NAME} 1> /dev/null 2>> ${PACKAGE_LOG}
     eval_retval2
 
     local DECOMPRESSED_DIRNAME=$(static_decompressed_dirname ${PACKAGE_NAME})
@@ -783,7 +781,8 @@ static_ipkg()
 
     # Removing old build directory (if any)
     if [ -d ${LFS_TMP}/${PACKAGE_NAME}-build ]; then
-       rm -v -rf ${LFS_TMP}/${PACKAGE_NAME}-build 1>> ${PACKAGE_LOG} 2>&1
+        echo "Removing old build directory" 1>> ${PACKAGE_LOG} 2>&1 &&
+       rm -v -rf ${LFS_TMP}/${PACKAGE_NAME}-build 1> /dev/null 2>> ${PACKAGE_LOG}
         eval_retval2
     fi
 
@@ -803,12 +802,14 @@ static_ipkg()
     # do so by renaming them.
     if [ -d ${LFS_TMP}/${PACKAGE_NAME} ]; then
        # Removing source directory
-       rm -v -rf ${LFS_TMP}/${PACKAGE_NAME} 1>> ${PACKAGE_LOG} 2>&1
+        echo "Removing source directory" 1>> ${PACKAGE_LOG} 2>&1 &&
+       rm -v -rf ${LFS_TMP}/${PACKAGE_NAME} 1> /dev/null 2>> ${PACKAGE_LOG}
         eval_retval2
     fi
     if [ -d ${LFS_TMP}/${PACKAGE_NAME}-build ]; then
        # Removing build directory
-       rm -v -rf ${LFS_TMP}/${PACKAGE_NAME}-build 1>> ${PACKAGE_LOG} 2>&1
+        echo "Removing build directory" 1>> ${PACKAGE_LOG} 2>&1 &&
+       rm -v -rf ${LFS_TMP}/${PACKAGE_NAME}-build 1> /dev/null 2>> ${PACKAGE_LOG}
         eval_retval2
     fi