Mirrors/packer-arch
1
0
Fork 0
mirror of https://github.com/elasticdog/packer-arch.git synced 2026-07-17 16:36:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix ISO checksum URL override in wrapper script

Browse source 
Resolves #52
This commit is contained in:
Aaron Bull Schaefer 2016-11-07 14:22:34 -08:00
parent 5dd890c2fa
commit aed4423b97
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
wrapacker
View file

@ -231,11 +231,9 @@ else
MIRROR='https://mirrors.kernel.org/archlinux'
fi
SHA1SUMS=$(curl -s "${MIRROR}/iso/latest/sha1sums.txt")
ISO_NAME=$(echo "$SHA1SUMS" | awk '/dual.iso/{ print $2 }')
ISO_CHECKSUM_URL="${MIRROR}/iso/latest/sha1sums.txt"
ISO_NAME=$(curl -s "$ISO_CHECKSUM_URL" | awk '/dual.iso/{ print $2 }')
ISO_URL="${MIRROR}/iso/latest/${ISO_NAME}"
ISO_CHECKSUM=$(echo "$SHA1SUMS" | awk '/dual.iso/{ print $1 }')
if [[ $timeout ]]; then
if [[ "$timeout" =~ ^[0-9]+(ns|us|ms|s|m|h)$ ]]; then
@ -255,7 +253,7 @@ if [[ $dry_run ]]; then
$PACKER_BIN build \\
-only=$PACKER_PROVIDER \\
-var "iso_url=$ISO_URL" \\
-var "iso_checksum=$ISO_CHECKSUM" \\
-var "iso_checksum_url=$ISO_CHECKSUM_URL" \\
-var "ssh_timeout=$SSH_TIMEOUT" \\
arch-template.json
EOF
@ -263,7 +261,7 @@ else
$PACKER_BIN build \
-only=$PACKER_PROVIDER \
-var "iso_url=$ISO_URL" \
-var "iso_checksum=$ISO_CHECKSUM" \
-var "iso_checksum_url=$ISO_CHECKSUM_URL" \
-var "ssh_timeout=$SSH_TIMEOUT" \
arch-template.json
fi