Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

shellcheck: fix escaping issue #97

Merged
merged 1 commit into from
May 17, 2017
Merged

shellcheck: fix escaping issue #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions dependencies/list_os_images.sh
View file
Open in desktop
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
View file
Open in desktop
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