From b3e1d31343ec7d4b9011bfdb76e4c9843ba31dc5 Mon Sep 17 00:00:00 2001
From: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Date: Sat, 28 Jun 2014 00:35:51 -0300
Subject: [archiso] Rework checksum function

---
 archiso/mkarchiso | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index cd95f0f..2de026e 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -100,8 +100,6 @@ _usage ()
     echo "      run command specified by -r"
     echo "   prepare"
     echo "      build all images"
-    echo "   checksum"
-    echo "      make a checksum.md5 for self-test"
     echo "   pkglist"
     echo "      make a pkglist.txt of packages installed on airootfs"
     echo "   iso <image name>"
@@ -110,7 +108,7 @@ _usage ()
 }
 
 # Shows configuration according to command mode.
-# $1: init | install | run | prepare | checksum | iso
+# $1: init | install | run | prepare | iso
 _show_config () {
     local _mode="$1"
     echo
@@ -132,8 +130,6 @@ _show_config () {
             ;;
         prepare)
             ;;
-        checksum)
-            ;;
         pkglist)
             ;;
         iso)
@@ -228,20 +224,12 @@ _mkairootfs () {
     rm ${work_dir}/airootfs.img
 }
 
-command_checksum () {
-    _show_config checksum
-
-    local _chk_arch
-
-    for _chk_arch in i686 x86_64; do
-        _msg_info "Creating checksum file for self-test (${_chk_arch})..."
-        cd "${work_dir}/iso/${install_dir}"
-        if [[ -d "${_chk_arch}" ]]; then
-            find ${_chk_arch} -type f -print0 | xargs -0 md5sum > checksum.${_chk_arch}.md5
-        fi
-        cd ${OLDPWD}
-        _msg_info "Done!"
-    done
+_mkchecksum () {
+    _msg_info "Creating checksum file for self-test..."
+    cd "${work_dir}/iso/${install_dir}/${arch}"
+    md5sum airootfs.sfs > airootfs.md5
+    cd ${OLDPWD}
+    _msg_info "Done!"
 }
 
 command_pkglist () {
@@ -305,6 +293,7 @@ command_prepare () {
 
     _cleanup
     _mkairootfs
+    _mkchecksum
 }
 
 # Install packages on airootfs.
@@ -383,9 +372,6 @@ case "${command_name}" in
     prepare)
         command_prepare
         ;;
-    checksum)
-        command_checksum
-        ;;
     pkglist)
         command_pkglist
         ;;
-- 
cgit v1.2.3-54-g00ecf