Whitespace. Stop hardcoding the bz2 extension and sync updates to the scripts to the experimental scripts.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
This commit is contained in:
Jorge Manuel B. S. Vicetto (jmbsvicetto) 2016-04-26 22:35:19 +00:00
parent 67beeebbdf
commit 11c84ac57d
7 changed files with 28 additions and 14 deletions

View file

@ -9,10 +9,15 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="i486 i686 hardened"
SETS="
i486
i686
hardened
"
SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
@ -20,6 +25,8 @@ SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@ -38,7 +45,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of