diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 502dc2d5..91319746 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -30,40 +30,40 @@ BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/ BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/ give_latest_from_dates() { - sed 's,-20,~20,g' | \ - sort -k +1 -n -t '~' |\ - awk -F\~ \ - 'BEGIN{i=$1; o=$0}; - { if($1 != i && i != "") { print o; }; i=$1; o=$0; } - END { print o; };' | \ - tr '~' '-' + sed 's,-20,~20,g' | \ + sort -k +1 -n -t '~' |\ + awk -F\~ \ + 'BEGIN{i=$1; o=$0}; + { if($1 != i && i != "") { print o; }; i=$1; o=$0; } + END { print o; };' | \ + tr '~' '-' } pre_build() { - pushd ${REPO_DIR} - git pull - popd - # Symlink the latest stages3 to build from - for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do - cd $d - for f in $(ls 'stage3*bz2' | 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 - done - done + pushd ${REPO_DIR} + git pull + popd + # Symlink the latest stages3 to build from + for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do + cd $d + for f in $(ls 'stage3*bz2' | 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 + done + done } post_build() { - cd ${BUILD_SRCDIR_BASE}/default - cp stage3-*${DATESTAMP}*bz2* ${BUILD_DESTDIR_BASE}/ - if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/ - fi - cd ${BUILD_SRCDIR_BASE}/hardened - if [ -n "$(ls -1 stage3-*${DATESTAMP}*.bz2.* 2>/dev/null)" ]; then - cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/ - fi + cd ${BUILD_SRCDIR_BASE}/default + cp stage3-*${DATESTAMP}*bz2* ${BUILD_DESTDIR_BASE}/ + if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/ + fi + cd ${BUILD_SRCDIR_BASE}/hardened + if [ -n "$(ls -1 stage3-*${DATESTAMP}*.bz2.* 2>/dev/null)" ]; then + cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/ + fi } # vim:ft=sh: diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf index e7f48be1..41d0acfb 100644 --- a/tools/catalyst-auto-x86.conf +++ b/tools/catalyst-auto-x86.conf @@ -28,40 +28,40 @@ BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/ BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/ give_latest_from_dates() { - sed 's,-20,~20,g' | \ - sort -k +1 -n -t '~' |\ - awk -F\~ \ - 'BEGIN{i=$1; o=$0}; - { if($1 != i && i != "") { print o; }; i=$1; o=$0; } - END { print o; };' | \ - tr '~' '-' + sed 's,-20,~20,g' | \ + sort -k +1 -n -t '~' |\ + awk -F\~ \ + 'BEGIN{i=$1; o=$0}; + { if($1 != i && i != "") { print o; }; i=$1; o=$0; } + END { print o; };' | \ + tr '~' '-' } pre_build() { - pushd ${REPO_DIR} - git pull - popd - # Symlink the latest stages3 to build from - for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do - cd $d - for f in $(ls 'stage3*bz2' | 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 - done - done + pushd ${REPO_DIR} + git pull + popd + # Symlink the latest stages3 to build from + for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do + cd $d + for f in $(ls 'stage3*bz2' | 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 + done + done } post_build() { - cd ${BUILD_SRCDIR_BASE}/default - cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE} - if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then - cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/ - fi - cd ${BUILD_SRCDIR_BASE}/hardened - if [ -n "$(ls -1 stage3-i686-*${DATESTAMP}*.bz2* 2>/dev/null)" ]; then - cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/ - fi + cd ${BUILD_SRCDIR_BASE}/default + cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE} + if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then + cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/ + fi + cd ${BUILD_SRCDIR_BASE}/hardened + if [ -n "$(ls -1 stage3-i686-*${DATESTAMP}*.bz2* 2>/dev/null)" ]; then + cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/ + fi } # vim:ft=sh: