From 1162948c40db4c7969a759739c7cdd0a37115630 Mon Sep 17 00:00:00 2001 From: belliash Date: Wed, 18 Jan 2012 11:10:13 +0100 Subject: [PATCH] rename variable TEMPDIR to STOREDIR --- config/common.conf | 2 +- config/layout.conf | 14 +++++++------- libraries/filesystem | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/common.conf b/config/common.conf index a4f2e36..a03ee49 100644 --- a/config/common.conf +++ b/config/common.conf @@ -37,7 +37,7 @@ PUSHDATEFORMAT="%a %b %d %H:%M:%S %Z %Y" # Specifies where EzBuild will store everything that it builds, and also where it will # put all its temporary files and caches. -TEMPDIR="/var/tmp/ezbuild" +STOREDIR="/var/tmp/ezbuild" # Treats all errors as fatal, when enabled. Disabling this option allows EzBuild scripts # to continue execution when some non-fatal errors occure. They all will be treated as diff --git a/config/layout.conf b/config/layout.conf index e01ce4b..a7e1c50 100644 --- a/config/layout.conf +++ b/config/layout.conf @@ -4,27 +4,27 @@ # Specifies the path to the directory that will contain any temporary created executable # files, necessary for EzBuild to operate correctly. -BINDIR="${TEMPDIR}/bin" +BINDIR="${STOREDIR}/bin" # Directive sets the path to the directory, where EzBuild will store everything that it # builds (eg. stages). -BUILDDIR="${TEMPDIR}/builds" +BUILDDIR="${STOREDIR}/builds" # Defines the directory in which overlays with user made ebuilds will be saved for further # merging with portage tree. -OVERLAYSDIR="${TEMPDIR}/overlays" +OVERLAYSDIR="${STOREDIR}/overlays" # Directive sets the path where EzBuild will put binary packages for all ebuilds processed # in addition to compiling and installing the packages. -PACKAGESDIR="${TEMPDIR}/packages" +PACKAGESDIR="${STOREDIR}/packages" # This is the path where EzBuild will store entire portage trees, that are necessary for # synchronization with the mainline (usually Gentoo). -PORTAGESDIR="${TEMPDIR}/portages" +PORTAGESDIR="${STOREDIR}/portages" # This specifies the directory where EzBuild will put its temporary files and caches. -TRASHDIR="${TEMPDIR}/temp" +TRASHDIR="${STOREDIR}/temp" # Directive sets the filename for logging of all information about the progress and of all # executed commands output. This has to contain absolute path to the created file. -LOGFILE="${TEMPDIR}/${EZNAME}.log" +LOGFILE="${STOREDIR}/${EZNAME}.log" diff --git a/libraries/filesystem b/libraries/filesystem index 1ae7c49..c4fec34 100644 --- a/libraries/filesystem +++ b/libraries/filesystem @@ -30,7 +30,7 @@ function cleanLog() { # Completely removes whole temp directory #------------------------------------------------------------------------------- function cleanTemp() { - rm -rf ${TEMPDIR} &> /dev/null + rm -rf ${STOREDIR} &> /dev/null } #------------------------------------------------------------------------------- @@ -88,7 +88,7 @@ function generateDigests() { #------------------------------------------------------------------------------- function makeCoreDirectories() { local DIRS="${BINDIR} ${BUILDDIR} ${LOGFILE%/*} ${OVERLAYSDIR} \ - ${PACKAGESDIR} ${PORTAGESDIR} ${TEMPDIR} ${TRASHDIR}" + ${PACKAGESDIR} ${PORTAGESDIR} ${STOREDIR} ${TRASHDIR}" for DIR in ${DIRS}; do makeDirectory ${DIR} || return 1 done