Merge branch 'issue/585' into 'develop'

SCRUM#585: Remove unused code

See merge request !15

scripts-available/make-initrd.sh

@@ -51,27 +51,21 @@ version="$(basename "${initrd_path}" | cut --delimiter='-' --fields=2,3)"
 cp "${CHROOTDIR}/boot/vmlinuz-${version}-generic" "${TMP}/image/casper/vmlinuz" || createIsoLogger --message "Unable to copy kernel to image" --tag "cp"
 
 # The initrd is converted from gzip to lzma
-if ! test -f initrd.lz; then
-    if [ ! -d "${PREFIX}/initrd" ]; then
-        mkdir "${PREFIX}/initrd"
-    else
-        rm --recursive --force "${PREFIX:?}"/initrd/*
-    fi
-    createIsoLogger --message "Using '$(basename "${initrd_path}")'" --type info
-    initrd_type="$(file "${initrd_path}")"
-    pushd "${PREFIX}/initrd" || createIsoLogger --message "Unable to change directory" --tag "pushd"
-    if grep --quiet --ignore-case "gzip" <<< "${initrd_type}"; then
-        gzip --decompress --stdout "${initrd_path}" | cpio --extract || createIsoLogger --message "Unable to decompress initrd" --tag "gzip"
-    elif grep --quiet --ignore-case "ascii" <<< "${initrd_type}"; then
-        block_size="$(binwalk --include="compressed data" "${initrd_path}" | cut --delimiter=" " --fields=1 | grep -E "[0-9]+")"
-        dd if="${initrd_path}" bs="${block_size}" skip=1 | gunzip | cpio --extract --make-directories
-    else
-        createIsoLogger --message "Invalid initrd format"
-    fi
-    find . | cpio --quiet --create -H newc | lzma -7 > ../initrd.lz || createIsoLogger --message "Unable to compress initrd" --tag "lzma"
-    popd || createIsoLogger --message "Unable to change directory" --tag "popd"
-    rm --recursive --force "${PREFIX:?}/initrd"
+createIsoLogger --message "Using '$(basename "${initrd_path}")'" --type info
+initrd_type="$(file "${initrd_path}")"
+mkdir "${PREFIX}/initrd"
+pushd "${PREFIX}/initrd" || createIsoLogger --message "Unable to change directory" --tag "pushd"
+if grep --quiet --ignore-case "gzip" <<< "${initrd_type}"; then
+    gzip --decompress --stdout "${initrd_path}" | cpio --extract || createIsoLogger --message "Unable to decompress initrd" --tag "gzip"
+elif grep --quiet --ignore-case "ascii" <<< "${initrd_type}"; then
+    block_size="$(binwalk --include="compressed data" "${initrd_path}" | cut --delimiter=" " --fields=1 | grep -E "[0-9]+")"
+    dd if="${initrd_path}" bs="${block_size}" skip=1 | gunzip | cpio --extract --make-directories
+else
+    createIsoLogger --message "Invalid initrd format"
 fi
+find . | cpio --quiet --create -H newc | lzma -7 > ../initrd.lz || createIsoLogger --message "Unable to compress initrd" --tag "lzma"
+popd || createIsoLogger --message "Unable to change directory" --tag "popd"
+rm --recursive --force "${PREFIX:?}/initrd" || createIsoLogger --message "Unable to remove dir \"${PREFIX}/initrd\"" --tag "rm"
 mv initrd.lz "${TMP}/image/casper/initrd.lz" || createIsoLogger --message "Unable to move initrd to image" --tag "mv"