Date: Sat, 1 Oct 2005 01:38:18 GMT From: soc-saturnero <soc-saturnero@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 84586 for review Message-ID: <200510010138.j911cIpd004563@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=84586 Change 84586 by soc-saturnero@soc-saturnero_sberta on 2005/10/01 01:38:12 - Changed DEBUG environment variable to FREESBIE_DEBUG in order to avoid conflicts with buildkernel - Added check for existence of targets under scripts/custom directory. This directory can contain customised scripts, without having to patch the existent ones. Affected files ... .. //depot/projects/soc2005/freesbie/scripts/custom/README#1 add .. //depot/projects/soc2005/freesbie/scripts/launch.sh#7 edit Differences ... ==== //depot/projects/soc2005/freesbie/scripts/launch.sh#7 (text+ko) ==== @@ -17,8 +17,8 @@ exit 1 fi -# If the DEBUG environment variable is set, be verbose. -[ ! -z "${DEBUG:-}" ] && set -x +# If the FREESBIE_DEBUG environment variable is set, be verbose. +[ ! -z "${FREESBIE_DEBUG:-}" ] && set -x # Set the absolute path for the toolkit dir LOCALDIR=$(cd $(dirname $0)/.. && pwd) @@ -55,7 +55,17 @@ kill $$ # XXX exit 1 won't work. } -if [ -f "${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh" ]; then +# Check order: +# - scripts/custom/${ARCH}/${TARGET}.sh +# - scripts/custom/${TARGET}.sh +# - scripts/${ARCH}/${TARGET}.sh +# - scripts/custom/${ARCH}/${TARGET}.sh + +if [ -f "${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh" ]; then + . ${LOCALDIR}/scripts/custom/${ARCH}/${TARGET}.sh +elif [ -f "${LOCALDIR}/scripts/custom/${TARGET}.sh" ]; then + . ${LOCALDIR}/scripts/custom/${TARGET}.sh +elif [ -f "${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh" ]; then . ${LOCALDIR}/scripts/${ARCH}/${TARGET}.sh elif [ -f "${LOCALDIR}/scripts/${TARGET}.sh" ]; then . ${LOCALDIR}/scripts/${TARGET}.sh @@ -63,4 +73,4 @@ if [ ${REMOVELOG} -eq 1 ]; then rm -f ${LOGFILE} -fi+fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200510010138.j911cIpd004563>