[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Matt Turner]

commit:     77d740ccdb80cbe368e0bf6169298670cbe811a9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 01:50:57 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr  9 19:23:43 2020 +0000
URL:        https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=77d740cc

targets: Move isoroot verify check into isoroot_checksum()

This will simplify the callers.

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 targets/support/create-iso.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/targets/support/create-iso.sh b/targets/support/create-iso.sh
index 8c0da181..b32c669e 100755
--- a/targets/support/create-iso.sh
+++ b/targets/support/create-iso.sh
@@ -97,6 +97,8 @@ fi
 # Generate list of checksums that genkernel can use to verify the contents of
 # the ISO
 isoroot_checksum() {
+       [ -z "${clst_livecd_verify}" ] && return
+
        echo ">> Creating checksums for all files included in the ISO"
 
        pushd "${clst_target_path}"
@@ -107,7 +109,7 @@ isoroot_checksum() {
 }
 
 run_mkisofs() {
-       [ -n "${clst_livecd_verify}" ] && isoroot_checksum
+       isoroot_checksum
 
        echo "Running \"mkisofs ${@}\""
        mkisofs "${@}" || die "Cannot make ISO image"