From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 5C792138A1A for ; Fri, 6 Feb 2015 20:13:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29617E08C4; Fri, 6 Feb 2015 20:13:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C81DCE08C4 for ; Fri, 6 Feb 2015 20:13:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C692B340726 for ; Fri, 6 Feb 2015 20:13:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8009B1132A for ; Fri, 6 Feb 2015 20:13:20 +0000 (UTC) From: "Jorge Manuel B. S. Vicetto" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jorge Manuel B. S. Vicetto" Message-ID: <1423253514.e0189f9b76508e61844cffa11a2ac89adfae28e5.jmbsvicetto@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: scripts/ X-VCS-Repository: proj/releng X-VCS-Files: scripts/copy_buildsync.sh X-VCS-Directories: scripts/ X-VCS-Committer: jmbsvicetto X-VCS-Committer-Name: Jorge Manuel B. S. Vicetto X-VCS-Revision: e0189f9b76508e61844cffa11a2ac89adfae28e5 X-VCS-Branch: master Date: Fri, 6 Feb 2015 20:13:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8ba5fac3-249f-4c85-91aa-82bd75e4d59d X-Archives-Hash: 1277ce018c3c230ad4d572d57749dfc7 commit: e0189f9b76508e61844cffa11a2ac89adfae28e5 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Fri Feb 6 20:11:54 2015 +0000 Commit: Jorge Manuel B. S. Vicetto gentoo org> CommitDate: Fri Feb 6 20:11:54 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=e0189f9b Update the script to improve the readbility of the latest-{iso,stage3} for amd64/x86. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> --- scripts/copy_buildsync.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh index b0b2b61..30b25a6 100755 --- a/scripts/copy_buildsync.sh +++ b/scripts/copy_buildsync.sh @@ -69,9 +69,11 @@ for ARCH in $ARCHES; do if [ -n "${iso_list}" ]; then echo -e "${header}" >"${OUT_ISO}" - echo -e "${iso_list}" |awk '{print $3}' | grep "$latest_iso_date" >>${OUT_ISO} - rm -f current-iso - ln -sf "$latest_iso_date" current-iso + if [[ ! $(echo ${iso_list} | egrep "amd64|x86") ]]; then + echo -e "${iso_list}" |awk '{print $3}' | grep "$latest_iso_date" >>${OUT_ISO} + rm -f current-iso + ln -sf "$latest_iso_date" current-iso + fi fi if [ -n "${stage3_list}" ]; then echo -e "${header}" >"${OUT_STAGE3}" @@ -91,10 +93,12 @@ for ARCH in $ARCHES; do echo -n '' >"${tmpdir}"/.keep.${ARCH}.txt for v in $variants ; do variant_path=$(find 20* -iname "${v}-20*" \( -name '*.tar.bz2' -o -iname '*.iso' \) -print | sed -e "s,.*/$a/autobuilds/,,g" | sort -k1,1 -t/ | tail -n1 ) + size=$(stat --format=%s ${variant_path}) f="latest-${v}.txt" echo -e "${header}" >"${f}" - echo -e "${variant_path}" >>${f} - echo -e "${variant_path}" >>${OUT_STAGE3} + echo -e "${variant_path} ${size}" >>${f} + [[ ${variant_path} =~ tar.*$ ]] && echo -e "${variant_path} ${size}" >>${OUT_STAGE3} + [[ ${variant_path} =~ iso$ ]] && echo -e "${variant_path} ${size}" >>${OUT_ISO} rm -f "current-$v" ln -sf "${variant_path%/*}" "current-$v" echo "${variant_path}" | sed -e 's,/.*,,g' -e 's,^,/,g' -e 's,$,$,g' >>"${tmpdir}"/.keep.${ARCH}.txt