Skip to content

Commit

Permalink
Merge pull request #97 from kinvolk/alban/update-shfmt-3
Browse files Browse the repository at this point in the history
shellcheck: fix escaping issue
  • Loading branch information
Alfonso Acosta authored May 17, 2017
2 parents 5542498 + 1d535c7 commit 960d222
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions dependencies/list_os_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ Dependencies:
- gcloud, Google Cloud Platform's CLI
- aws,
Usage:
$ ./$(basename "$0") PROVIDER OS
\$ ./$(basename "$0") PROVIDER OS
PROVIDER={gcp}
OS={ubuntu|debian|centos}
Example:
$ ./$(basename "$0") gcp ubuntu
\$ ./$(basename "$0") gcp ubuntu
ubuntu-os-cloud/ubuntu-1204-lts
ubuntu-os-cloud/ubuntu-1404-lts
ubuntu-os-cloud/ubuntu-1604-lts
Expand Down
18 changes: 9 additions & 9 deletions provisioning/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,11 @@ function tf_ssh_usage() {
ERROR: $1
Usage:
$ tf_ssh <host ID (1-based)> [OPTION]...
\$ tf_ssh <host ID (1-based)> [OPTION]...
Examples:
$ tf_ssh 1
$ tf_ssh 1 -o LogLevel VERBOSE
$ tf_ssh 1 -i ~/.ssh/custom_private_key_id_rsa
\$ tf_ssh 1
\$ tf_ssh 1 -o LogLevel VERBOSE
\$ tf_ssh 1 -i ~/.ssh/custom_private_key_id_rsa
Available machines:
EOF
cat -n >&2 <<<"$(terraform output public_etc_hosts)"
Expand All @@ -330,12 +330,12 @@ function tf_ansi_usage() {
ERROR: $1
Usage:
$ tf_ansi <playbook or playbook ID (1-based)> [OPTION]...
\$ tf_ansi <playbook or playbook ID (1-based)> [OPTION]...
Examples:
$ tf_ansi setup_weave-net_dev
$ tf_ansi 1
$ tf_ansi 1 -vvv --private-key=~/.ssh/custom_private_key_id_rsa
$ tf_ansi setup_weave-kube --extra-vars "docker_version=1.12.6 kubernetes_version=1.5.6"
\$ tf_ansi setup_weave-net_dev
\$ tf_ansi 1
\$ tf_ansi 1 -vvv --private-key=~/.ssh/custom_private_key_id_rsa
\$ tf_ansi setup_weave-kube --extra-vars "docker_version=1.12.6 kubernetes_version=1.5.6"
Available playbooks:
EOF
cat -n >&2 <<<"$(for file in "$(dirname "${BASH_SOURCE[0]}")"/../../config_management/*.yml; do basename "$file" | sed 's/.yml//'; done)"
Expand Down

0 comments on commit 960d222

Please sign in to comment.