From ab501f4234d26e7062f703a11525d734420f9185 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 29 Aug 2011 17:43:15 +0000 Subject: [PATCH] Using own jigdo-gen-md5-list to avoid restriction to Linux and FreeBSD --- releng/manual_isojigdo | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/releng/manual_isojigdo b/releng/manual_isojigdo index 13ffb09e..559fb8e4 100755 --- a/releng/manual_isojigdo +++ b/releng/manual_isojigdo @@ -205,16 +205,22 @@ JIGDO_MAP="Debian=${JIGDO_MAP_RHV}/" # create jigdo MD5 list in base64 format JIGDO_GEN_MD5=${GEN_DATA_DIR}/${RELENG_IMG}.md5 -if which jigdo-gen-md5-list >/dev/null 2>&1; then - printf "${SELF}: Creating MD5 list in hex format in ${JIGDO_GEN_MD5}..." - jigdo-gen-md5-list ${RELENG_DIR} > ${JIGDO_GEN_MD5} - printf "Done.\n" + +printf "${SELF}: Creating MD5 list in hex format in ${JIGDO_GEN_MD5}..." +set +e +./jigdo-gen-md5-list ${RELENG_DIR} > ${JIGDO_GEN_MD5} +ret=$? +set -e + +if test "$ret" = 0 +then + printf "Done.\n" else - printf "\n${SELF}: Not found: jigdo-gen-md5-list. Install jigit >= 1.18." - printf "\n${SELF}: http://www.einval.com/~steve/software/JTE/\n" - cleanup - exit 9 + printf "\nFAIL : ${SELF}: ./jigdo-gen-md5-list returns $ret" + cleanup + exit 9 fi + CMD="$CMD \ -jigdo-template-compress gzip \