catalyst-auto: unify catalyst.conf parsing
This commit is contained in:
parent
2736e468eb
commit
a85f4327c6
|
@ -17,6 +17,8 @@ if [[ -z ${UNSHARE} ]] ; then
|
||||||
fi
|
fi
|
||||||
unset UNSHARE
|
unset UNSHARE
|
||||||
|
|
||||||
|
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
||||||
|
|
||||||
declare -a config_files
|
declare -a config_files
|
||||||
config_files=()
|
config_files=()
|
||||||
verbose=0
|
verbose=0
|
||||||
|
@ -87,6 +89,12 @@ post_build() {
|
||||||
local foo=bar
|
local foo=bar
|
||||||
}
|
}
|
||||||
|
|
||||||
|
catalyst_var() {
|
||||||
|
# Extract a setting from the catalyst.conf.
|
||||||
|
local var=$1
|
||||||
|
(. "${CATALYST_CONFIG}"; echo "${!var}")
|
||||||
|
}
|
||||||
|
|
||||||
# Parse args
|
# Parse args
|
||||||
params=${#}
|
params=${#}
|
||||||
while [ ${#} -gt 0 ]
|
while [ ${#} -gt 0 ]
|
||||||
|
@ -136,6 +144,7 @@ if [[ $doneconfig -eq 0 ]]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
BUILD_SRCDIR_BASE=$(catalyst_var storedir)
|
||||||
|
|
||||||
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
|
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
|
||||||
DATESTAMP=$(date +%Y%m%d)
|
DATESTAMP=$(date +%Y%m%d)
|
||||||
|
|
|
@ -19,10 +19,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
|
||||||
EMAIL_FROM=armin76@gentoo.org
|
EMAIL_FROM=armin76@gentoo.org
|
||||||
EMAIL_SUBJECT_PREPEND="[alpha-auto]"
|
EMAIL_SUBJECT_PREPEND="[alpha-auto]"
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
|
||||||
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
||||||
|
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
|
||||||
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
||||||
|
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
|
||||||
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
||||||
|
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
|
||||||
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
||||||
|
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
|
||||||
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
||||||
|
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
|
||||||
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
||||||
|
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -19,10 +19,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
|
||||||
EMAIL_FROM=catalyst@hake.hppa.dev.gentoo.org
|
EMAIL_FROM=catalyst@hake.hppa.dev.gentoo.org
|
||||||
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
|
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -16,10 +16,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
|
||||||
EMAIL_FROM=catalyst@guppy.ia64.dev.gentoo.org
|
EMAIL_FROM=catalyst@guppy.ia64.dev.gentoo.org
|
||||||
EMAIL_SUBJECT_PREPEND="[ia64-auto]"
|
EMAIL_SUBJECT_PREPEND="[ia64-auto]"
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -16,10 +16,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
|
||||||
EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
|
EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
|
||||||
EMAIL_SUBJECT_PREPEND="[ppc-auto]"
|
EMAIL_SUBJECT_PREPEND="[ppc-auto]"
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -17,10 +17,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
|
||||||
EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
|
EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
|
||||||
EMAIL_SUBJECT_PREPEND="[ppc64-auto]"
|
EMAIL_SUBJECT_PREPEND="[ppc64-auto]"
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -17,10 +17,6 @@ EMAIL_FROM=catalyst@$(hostname)
|
||||||
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
||||||
|
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -17,10 +17,6 @@ EMAIL_FROM=catalyst@$(hostname)
|
||||||
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
|
||||||
|
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
|
@ -16,10 +16,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
|
||||||
EMAIL_FROM=catalyst@bender.sparc.dev.gentoo.org
|
EMAIL_FROM=catalyst@bender.sparc.dev.gentoo.org
|
||||||
EMAIL_SUBJECT_PREPEND="[sparc64-auto]"
|
EMAIL_SUBJECT_PREPEND="[sparc64-auto]"
|
||||||
|
|
||||||
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
|
|
||||||
|
|
||||||
BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
|
|
||||||
|
|
||||||
give_latest_from_dates() {
|
give_latest_from_dates() {
|
||||||
sed 's,-20,~20,g' | \
|
sed 's,-20,~20,g' | \
|
||||||
sort -k +1 -n -t '~' |\
|
sort -k +1 -n -t '~' |\
|
||||||
|
|
Loading…
Reference in a new issue