Ré-organisatrion stage3 et stage5 comme les stages 0 à 2

[hvlinux.git] / functions

diff --git a/functions b/functions
index 8052648..ea18ae2 100644 (file)
--- a/functions
+++ b/functions
@@ -216,7 +216,7 @@ static_bootscript_add()
        echo "${FUNCNAME}(), invalid level argument : ${*}"
        return 1
     fi
-    
+
     # Making sure bootscript has correct permissions
     chmod -v 740 ${LFS}/etc/rc.d/init.d/${SCRIPTNAME}
 
@@ -310,7 +310,7 @@ var_export()
        echo "${FUNCNAME}(), wrong number of arguments: ${*}"
        return 1
     fi
-    
+
     # Checking if file exists
     if [ ! -f ${FILE} ]; then
        echo "${FUNCNAME}(), file not found: ${FILE}"
@@ -357,7 +357,7 @@ var_add()
        echo "${FUNCNAME}(), wrong number of arguments: ${*}"
        return 1
     fi
-    
+
     # Checking if file exists
     if [ ! -f ${FILE} ]; then
        echo "${FUNCNAME}(), file not found: ${FILE}"
@@ -400,7 +400,7 @@ var_add()
        # Variable value is NOT enclosed by double-quotes
        sed -i "s!\(^export ${VARIABLE}=.*\)!\1${SEP}${VALUE}!" ${FILE}
     fi
-    
+
     return $?
 }
 
@@ -438,7 +438,7 @@ string_add()
        echo "${FUNCNAME}(), wrong number of arguments: ${*}"
        return 1
     fi
-    
+
     # Checking if file exists
     if [ ! -f ${FILE} ]; then
        echo "${FUNCNAME}(), file not found: ${FILE}"
@@ -450,7 +450,7 @@ string_add()
        echo "${FUNCNAME}(), string already defined: ${STRING}"
        return 0
     fi
-    
+
     echo "${STRING}" >> ${FILE}
 }
 
@@ -470,7 +470,7 @@ var_add_shadow()
        echo "${FUNCNAME}(), wrong number of arguments: ${*}"
        return 1
     fi
-    
+
     # Checking if file exists
     if [ ! -f ${FILE} ]; then
        echo "${FUNCNAME}(), file not found: ${FILE}"
@@ -502,7 +502,7 @@ hv_groupadd()
        last_argument=${*}
        shift
     done
-    
+
     groupadd ${arguments}
     error=$?
 
@@ -522,24 +522,14 @@ hv_useradd()
 {
     arguments="${*}"
 
-    set +e
-
     # The last argument is the username
     while [ $# -ne 0 ]; do
-       last_argument=${*}
+       username=${*}
        shift
     done
 
-    useradd ${arguments}
-    error=$?
-
-    set -e
-
-    if [ ${error} -eq 0 -o ${error} -eq 9 ]; then
-        # 9 means the user already exists
-        return ${EXIT_SUCCESS}
-    else
-        exit ${EXIT_FAILURE}
+    if ! cat /etc/passwd | egrep "^${username}:" 1> /dev/null 2>&1; then
+        useradd ${arguments}
     fi
 }
 
@@ -585,13 +575,13 @@ apply_patches()
        echo "Usage: ${FUNCNAME} PACKAGE-NAME"
        exit ${EXIT_FAILURE}
     fi
-    
+
     if [ $# -eq 2 ]; then
        TARGET_DIR=${2}
     else
        TARGET_DIR=${PACKAGE}
     fi
-    
+
     # Checking if we can find at least one patch.
     if ls ${LFS_PKG_DIR}/${1}-*.patch 1> /dev/null 2>&1; then
        cd ${LFS_PKG_DIR}
@@ -640,7 +630,7 @@ static_decompressed_dirname()
 
 # Decompression of a package
 # First argument: package name
-# Second argument: directory where decompressing (optional)
+# Second argument: directory where decompressing (optional, defaults to LFS_TMP)
 decompress_package()
 {
     # Checking for correct number of arguments