djpbessems/Tinkerbell.Sandbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename "generate-envrc" to "generate-env" (#79)

Browse Source 
Rename "generate-envrc" to "generate-env"
This commit is contained in:
mergify[bot] 2021-04-20 08:59:26 +00:00 committed by GitHub
commit 28a236376f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/bump-version/main.go
View File

@ -59,7 +59,7 @@ const headerFile = `#!/bin/bash
# This file is generated by an utility called bump-version in # This file is generated by an utility called bump-version in
# tinkerbell/sandbox. # tinkerbell/sandbox.
# This file gets used from generate-envrc.sh but it is also used standalone by # This file gets used from generate-env.sh but it is also used standalone by
# automation that wants to get the version of the programs currently supported # automation that wants to get the version of the programs currently supported
# in sandbox # in sandbox

2
current_versions.sh
View File

@ -2,7 +2,7 @@
# This file is generated by an utility called bump-version in # This file is generated by an utility called bump-version in
# tinkerbell/sandbox. # tinkerbell/sandbox.
# This file gets used from generate-envrc.sh but it is also used standalone by # This file gets used from generate-env.sh but it is also used standalone by
# automation that wants to get the version of the programs currently supported # automation that wants to get the version of the programs currently supported
# in sandbox # in sandbox

4
deploy/terraform/main.tf
View File

@ -57,8 +57,8 @@ resource "null_resource" "tink_directory" {
} }
provisioner "file" { provisioner "file" {
source = "../../generate-envrc.sh" source = "../../generate-env.sh"
destination = "/root/tink/generate-envrc.sh" destination = "/root/tink/generate-env.sh"
} }
provisioner "file" { provisioner "file" {

2
deploy/vagrant/scripts/tinkerbell.sh
View File

@ -35,7 +35,7 @@ main() (
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
if [ ! -f ./.env ]; then if [ ! -f ./.env ]; then
./generate-envrc.sh eth1 >.env ./generate-env.sh eth1 >.env
fi fi
# shellcheck disable=SC1091 # shellcheck disable=SC1091

4
generate-envrc.sh → generate-env.sh
View File

@ -44,7 +44,7 @@ generate_password() (
head -c 12 /dev/urandom | sha256sum | cut -d' ' -f1 head -c 12 /dev/urandom | sha256sum | cut -d' ' -f1
) )
generate_envrc() ( generate_env() (
local tink_interface=$1 local tink_interface=$1
validate_tinkerbell_network_interface "$tink_interface" validate_tinkerbell_network_interface "$tink_interface"
@ -99,7 +99,7 @@ main() (
exit 1 exit 1
fi fi
generate_envrc "$1" generate_env "$1"
) )
main "$@" main "$@"

2
setup.sh
View File

@ -490,7 +490,7 @@ do_setup() (
check_prerequisites "$lsb_dist" "$lsb_version" check_prerequisites "$lsb_dist" "$lsb_version"
if [ ! -f "$ENV_FILE" ]; then if [ ! -f "$ENV_FILE" ]; then
echo "$ERR Run './generate-envrc.sh network-interface > \"$ENV_FILE\"' before continuing." echo "$ERR Run './generate-env.sh network-interface > \"$ENV_FILE\"' before continuing."
exit 1 exit 1
fi fi