From df87273ceb21def5ed7c6a18a8379ab0d252dd8b Mon Sep 17 00:00:00 2001 From: George Danchev Date: Sat, 9 Jul 2011 09:49:10 +0000 Subject: [PATCH] use common section in the heading of the log file, versioning etc --- releng/releng_isojigdo | 13 +++++-------- releng/run_all_releng | 9 +++++++++ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/releng/releng_isojigdo b/releng/releng_isojigdo index 5a23ef44..a750b873 100755 --- a/releng/releng_isojigdo +++ b/releng/releng_isojigdo @@ -42,13 +42,7 @@ printf "\n\tIN_isolinux=${RELENG_ISOLINUX_BIN}\n\tOUT_bootcat=${RELENG_BOOT_CAT} RES="${RELENG_IMG}.iso ${RELENG_IMG}.new ${RELENG_IMG}.md5 ${RELENG_IMG}.jigdo ${RELENG_IMG}.template" # xorriso version details, incl. underlying libraries -"${RELENG_XORRISO}" -version -if ! "${RELENG_XORRISO}" -version | grep libjte >/dev/null 2>&1; then - printf "\n${SELF}: JTE not supported with this xorriso build. Install jigit >=1.18 and rebuild." - printf "\n${SELF}: http://www.einval.com/~steve/software/JTE/\n" - cleanup - exit 3 -fi +# "${RELENG_XORRISO}" -version # check whether the binary support JTE set +e @@ -60,7 +54,10 @@ case ${RETCODE_VER_JTE} in printf "\n${SELF}: Found JTE support with ${RELENG_XORRISO} : ${RETSTR_VER_JTE}" ;; *) - printf "\n${SELF}: FAIL: Not found JTE support in ${RELENG_XORRISO}. Quit.\n" + printf "\n${SELF}: FAIL: Not found JTE support in ${RELENG_XORRISO}. Quit." + printf "\n${SELF}: JTE not supported with this xorriso build. Install jigit >=1.18 and rebuild." + printf "\n${SELF}: http://www.einval.com/~steve/software/JTE/\n" + cleanup exit 4 ;; esac diff --git a/releng/run_all_releng b/releng/run_all_releng index e0be6ee7..263e0a0f 100755 --- a/releng/run_all_releng +++ b/releng/run_all_releng @@ -10,12 +10,16 @@ SELF=$(basename "$0") GEN_DATA_DIR=releng_generated_data CLOG=${GEN_DATA_DIR}/log.${SELF} PASSED_OPTIONS="$@" +RELENG_XORRISO= CLEANUP_LOG=0 ############################################# while getopts “x:k:c:f:h” OPT do case $OPT in + x) + RELENG_XORRISO=$OPTARG + ;; c) CLEANUP_LOG=1 ;; @@ -51,6 +55,11 @@ fi mv "${CLOG}" "${CLOG}".prev fi > ${CLOG} + if [ -x "${RELENG_XORRISO}" ]; then + echo -e "_OVERVIEW_______________________________________________________________" >> ${CLOG} + ${RELENG_XORRISO} --version >> ${CLOG} + echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >> ${CLOG} + fi DSTART=`date --utc` printf "\n${SELF}: Started at ${DSTART}" E1=`date '+%s'`