Skip to content
This repository was archived by the owner on May 6, 2025. It is now read-only.

Fix issues with envsubst and templates (#153) #155

Merged
merged 1 commit into from
Aug 2, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions templates/my_windows-10-enterprise-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ web pages:
```bash
dnf remove vagrant

VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant\
| jq -r -M '.current_version')
VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm

# virtualbox
Expand Down
3 changes: 1 addition & 2 deletions templates/windows-10-enterprise-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ web pages:
```bash
dnf remove vagrant

VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant\
| jq -r -M '.current_version')
VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm

# virtualbox
Expand Down
3 changes: 1 addition & 2 deletions templates/windows-server-2012-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ web pages:
```bash
dnf remove vagrant

VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant\
| jq -r -M '.current_version')
VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm

# virtualbox
Expand Down
3 changes: 1 addition & 2 deletions templates/windows-server-2016-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ web pages:
```bash
dnf remove vagrant

VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant\
| jq -r -M '.current_version')
VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm

# virtualbox
Expand Down
3 changes: 1 addition & 2 deletions templates/windows-server-2019-eval.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ web pages:
```bash
dnf remove vagrant

VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant\
| jq -r -M '.current_version')
VAGRANT_LATEST_VERSION=$(curl -s https://checkpoint-api.hashicorp.com/v1/check/vagrant | jq -r -M '.current_version')
dnf install https://releases.hashicorp.com/vagrant/${VAGRANT_LATEST_VERSION}/vagrant_${VAGRANT_LATEST_VERSION}_x86_64.rpm

# virtualbox
Expand Down
2 changes: 2 additions & 0 deletions upload_box_to_vagrantcloud.sh
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ cmdline() {
MY_NAME=$(echo "${VAGRANT_CLOUD_BOX_NAME}" | awk -F '-' '{ print $1 }')
VAGRANT_PROVIDER=$(echo "${VAGRANT_CLOUD_BOX_NAME}" | awk -F '-' '{ print $NF }')
export VAGRANT_PROVIDER
# Workaround for envsubst (https://github.com/ruzickap/packer-templates/issues/153)
export VAGRANT_LATEST_VERSION="\${VAGRANT_LATEST_VERSION}"

if [[ ! -f "${VAGRANT_CLOUD_BOX_FILE}" ]]; then
echo -e "*** ERROR: \"${VAGRANT_CLOUD_BOX_FILE}\" does not exist!\n"
Expand Down