--- branches/mage-next/src/smage2.in 2014/08/13 07:10:41 2745 +++ branches/mage-next/src/smage2.in 2014/09/02 13:55:19 2806 @@ -300,7 +300,7 @@ smagesource ${SMAGENAME} || die "source failed" PKGNAME="${PNAME}-${PVER}-${ARCH}$(print_distrotag)-${PBUILD}" MD5DIR="$(dirname ${SMAGENAME})/md5" -SMAGE_LOG_CMD="tee -a /var/log/smage/${PKGNAME}.log" +SMAGE_LOG_CMD="tee -a ${SMAGELOGDIR}/${PKGNAME}.log" xtitle "Compiling ${PKGNAME}" echo -e "${COLGREEN}Compiling ${PKGNAME}${COLDEFAULT}" @@ -353,12 +353,12 @@ echo -e "${COLMAGENTA}Resume requested; continuing previous build${COLDEFAULT}" # setup build logging - [[ ! -d /var/log/smage ]] && install -d /var/log/smage - if [[ -f /var/log/smage/${PKGNAME}.log.bz2 ]] + [[ ! -d ${SMAGELOGDIR} ]] && install -d ${SMAGELOGDIR} + if [[ -f ${SMAGELOGDIR}/${PKGNAME}.log.bz2 ]] then - bunzip2 -f /var/log/smage/${PKGNAME}.log.bz2 + bunzip2 -f ${SMAGELOGDIR}/${PKGNAME}.log.bz2 fi - echo -e "### Resume started on $(date) ###\n" >> /var/log/smage/${PKGNAME}.log + echo -e "### Resume started on $(date) ###\n" >> ${SMAGELOGDIR}/${PKGNAME}.log else # clean up builddir if a previously one exist @@ -394,8 +394,8 @@ fi # setup build logging - [[ ! -d /var/log/smage ]] && install -d /var/log/smage - echo -e "### Build started on $(date) ###\n" > /var/log/smage/${PKGNAME}.log + [[ ! -d ${SMAGELOGDIR} ]] && install -d ${SMAGELOGDIR} + echo -e "### Build started on $(date) ###\n" > ${SMAGELOGDIR}/${PKGNAME}.log fi if [[ ${PKGTYPE} = virtual ]] @@ -813,9 +813,9 @@ if mqueryfeature "buildlog" then - bzip2 -9f /var/log/smage/${PKGNAME}.log + bzip2 -9f ${SMAGELOGDIR}/${PKGNAME}.log else - [[ -f /var/log/smage/${PKGNAME}.log ]] && rm /var/log/smage/${PKGNAME}.log + [[ -f ${SMAGELOGDIR}/${PKGNAME}.log ]] && rm ${SMAGELOGDIR}/${PKGNAME}.log fi xtitleclean