aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUltrabug <ultrabug@ultrabug.net>2015-03-19 15:30:52 +0100
committerUltrabug <ultrabug@ultrabug.net>2015-03-19 15:30:52 +0100
commit391967e1c623c85e7fcc3bcf36a73d422984dba5 (patch)
tree2e9202b9ba06504d8cb8b08ad85de6064bedb33b
parentensure /usr exists but don't error if it does (diff)
parentFixed parsing of latest tarball (diff)
downloaddocker-images-391967e1c623c85e7fcc3bcf36a73d422984dba5.tar.gz
docker-images-391967e1c623c85e7fcc3bcf36a73d422984dba5.tar.bz2
docker-images-391967e1c623c85e7fcc3bcf36a73d422984dba5.zip
Merge pull request #11 from armbuild/fix-parsing-latest-tarball
Fixed parsing of latest tarball by @moul
-rwxr-xr-xamd64-hardened/build.sh2
-rw-r--r--amd64/build.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/amd64-hardened/build.sh b/amd64-hardened/build.sh
index 6d444ea..2fe9c68 100755
--- a/amd64-hardened/build.sh
+++ b/amd64-hardened/build.sh
@@ -4,7 +4,7 @@ die(){ echo "$@" 1>&2; exit 1; }
base_url="http://distfiles.gentoo.org/releases/amd64/autobuilds"
-latest_stage3=$(curl "${base_url}/latest-stage3-amd64-hardened.txt" 2>/dev/null | grep -v '#')
+latest_stage3=$(curl "${base_url}/latest-stage3-amd64-hardened.txt" 2>/dev/null | grep -v '#' | awk '{print $1}')
stage3=$(basename "${latest_stage3}")
[ ! -f "${stage3}" ] && xz=true || xz=false
diff --git a/amd64/build.sh b/amd64/build.sh
index 73ae7f8..d349467 100644
--- a/amd64/build.sh
+++ b/amd64/build.sh
@@ -4,7 +4,7 @@ die(){ echo "$@" 1>&2; exit 1; }
base_url="http://distfiles.gentoo.org/releases/amd64/autobuilds"
-latest_stage3=$(curl "${base_url}/latest-stage3-amd64.txt" 2>/dev/null | grep -v '#')
+latest_stage3=$(curl "${base_url}/latest-stage3-amd64.txt" 2>/dev/null | grep -v '#' | awk '{print $1}')
stage3=$(basename "${latest_stage3}")
[ ! -f "${stage3}" ] && xz=true || xz=false