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

Merge pull request #62 from appleby/appleby-arch-packer-bin-rename

Browse source 
Fix a handful of spooky wrapacker bugs
This commit is contained in:
Aaron Bull Schaefer 2018-10-31 17:59:19 +00:00 • committed by GitHub
commit 733d5d524b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
scripts/cleanup.sh
View file

@ -2,7 +2,6 @@
# Clean the pacman cache.
/usr/bin/yes | /usr/bin/pacman -Scc
/usr/bin/pacman-optimize
# Write zeros to improve virtual disk compaction.
zerofile=$(/usr/bin/mktemp /zerofile.XXXXX)

6
wrapacker
View file

@ -17,8 +17,8 @@
# country codes supported by https://www.archlinux.org/mirrorlist/
readonly VALID_COUNTRIES=(AT AU BD BE BG BR BY CA CH CL CN CO CZ DE DK EC ES FR GB GR HR HU ID IE IL IN IR IS IT JP KR KZ LT LU LV MK NC NL NO NZ PH PL PT RO RS RU SE SG SK TR TW UA US VN ZA)
# use the correct binary if running from arch linux
if [[ -f /etc/arch-release ]]; then
if command -v packer-io > /dev/null 2>&1; then
# Older arch linux versions called the packer binary packer-io.
readonly PACKER_BIN='packer-io'
else
readonly PACKER_BIN='packer'
@ -244,7 +244,7 @@ else
fi
ISO_CHECKSUM_URL="${MIRROR}/iso/latest/sha1sums.txt"
ISO_NAME=$(curl -s "$ISO_CHECKSUM_URL" | awk '/-x86_64.iso/{ print $2 }')
ISO_NAME=$(curl -sL "$ISO_CHECKSUM_URL" | awk '/-x86_64.iso/{ print $2 }')
ISO_URL="${MIRROR}/iso/latest/${ISO_NAME}"
if [[ $timeout ]]; then