use common section in the heading of the log file, versioning etc

This commit is contained in:
George Danchev 2011-07-09 09:49:10 +00:00
parent cbd20b1381
commit df87273ceb
2 changed files with 14 additions and 8 deletions

View File

@ -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" RES="${RELENG_IMG}.iso ${RELENG_IMG}.new ${RELENG_IMG}.md5 ${RELENG_IMG}.jigdo ${RELENG_IMG}.template"
# xorriso version details, incl. underlying libraries # xorriso version details, incl. underlying libraries
"${RELENG_XORRISO}" -version # "${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
# check whether the binary support JTE # check whether the binary support JTE
set +e 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}: 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 exit 4
;; ;;
esac esac

View File

@ -10,12 +10,16 @@ SELF=$(basename "$0")
GEN_DATA_DIR=releng_generated_data GEN_DATA_DIR=releng_generated_data
CLOG=${GEN_DATA_DIR}/log.${SELF} CLOG=${GEN_DATA_DIR}/log.${SELF}
PASSED_OPTIONS="$@" PASSED_OPTIONS="$@"
RELENG_XORRISO=
CLEANUP_LOG=0 CLEANUP_LOG=0
############################################# #############################################
while getopts “x:k:c:f:h” OPT while getopts “x:k:c:f:h” OPT
do do
case $OPT in case $OPT in
x)
RELENG_XORRISO=$OPTARG
;;
c) c)
CLEANUP_LOG=1 CLEANUP_LOG=1
;; ;;
@ -51,6 +55,11 @@ fi
mv "${CLOG}" "${CLOG}".prev mv "${CLOG}" "${CLOG}".prev
fi fi
> ${CLOG} > ${CLOG}
if [ -x "${RELENG_XORRISO}" ]; then
echo -e "_OVERVIEW_______________________________________________________________" >> ${CLOG}
${RELENG_XORRISO} --version >> ${CLOG}
echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" >> ${CLOG}
fi
DSTART=`date --utc` DSTART=`date --utc`
printf "\n${SELF}: Started at ${DSTART}" printf "\n${SELF}: Started at ${DSTART}"
E1=`date '+%s'` E1=`date '+%s'`