aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2017-12-07 23:40:09 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2017-12-07 23:40:38 -0800
commited258c751bb3457721112e2371d426c112369331 (patch)
tree74b5bde6f0ff0ea75969a426d2b6f557d99bace8 /scripts
parentweekly: cdtar files moved in newer catalyst. (diff)
downloadreleng-ed258c751bb3457721112e2371d426c112369331.tar.gz
releng-ed258c751bb3457721112e2371d426c112369331.tar.bz2
releng-ed258c751bb3457721112e2371d426c112369331.zip
tools/catalyst-auto: change datestamp->timestamp
Prepare for doing multiple automated runs in a single day on newer/faster build systems. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/copy_buildsync.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/copy_buildsync.sh b/scripts/copy_buildsync.sh
index 2b5c1ef1..d67cf6ee 100755
--- a/scripts/copy_buildsync.sh
+++ b/scripts/copy_buildsync.sh
@@ -70,7 +70,7 @@ copy_arch_to_outgoing() {
fi
# Copying
- for i in $(find ${indir} -type f | grep -- '-20[0123][0-9]\{5\}' | sed -e 's:^.*-\(20[^.]\+\).*$:\1:' | sort -ur); do
+ for i in $(find ${indir} -type f | egrep -- '-20[0123][0-9]{5}(([0-9]{6})|(T[0-9]{6}Z))?' | sed -e 's:^.*-\(20[^.]\+\).*$:\1:' | sort -ur); do
#echo "Doing $i"
t="${outdir}/${i}"
mkdir -p ${t} 2>/dev/null
@@ -154,7 +154,7 @@ process_arch() {
# New variant preserve code
find_variants=( '(' -iname '*.iso' -o -name 'netboot-*' -o "${EXTENSIONS[@]}" ')' )
- variants=$(find 20* "${find_variants[@]}" -printf '%f\n' 2>/dev/null | sed -e 's,-20[012][0-9]\{5\}.*,,g' -r | sort -u)
+ variants=$(find 20* "${find_variants[@]}" -printf '%f\n' 2>/dev/null | sed -e 's,-20[012][0-9]\{5\}.*,,g' -r | sort -u)
echo -n '' >"${tmpdir}"/.keep.${ARCH}.txt
for v in $variants ; do
variant_path=$(find 20* -iname "${v}-20*" "${find_variants[@]}" -print 2>/dev/null | sed -e "s,.*/$a/autobuilds/,,g" | sort -k1,1 -t/ | tail -n1 )