Skip to content

Commit e01c3ed

Browse files
committed
use column command instead of manually-adjusted table format
1 parent 42c754c commit e01c3ed

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

smoketest.bash

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,23 @@ ENFORCE_AGENT_TLS=${ENFORCE_AGENT_TLS:-false}
3131

3232
display_usage() {
3333
echo "Usage:"
34-
echo -e "\t-h\t\t\t\t\t\t\tprint this Help text."
35-
echo -e "\t-O\t\t\t\t\t\t\tOffline mode, do not attempt to pull container images."
36-
echo -e "\t-p\t\t\t\t\t\t\tdisable auth Proxy."
37-
echo -e "\t-s [none,$(ls -1 compose/s3-*.yml | grep -v none | sort | cut -d/ -f2 | cut -d. -f1 | cut -d- -f2 | paste -sd ',' -)]\tS3 implementation to spin up (default \"seaweed\")."
38-
echo -e "\t-G\t\t\t\t\t\t\texclude Grafana dashboard and jfr-datasource from deployment."
39-
echo -e "\t-r [replicas]\t\t\t\t\t\tconfigure a cryostat-reports sidecar instance(s). Optional argument is the number of replicas, which defaults to 1."
40-
echo -e "\t-t [all|comma-list]\t\t\t\t\tinclude sample applications for Testing. Leave blank or use 'all' to deploy everything, otherwise use a comma-separated list from:\n\t\t\t\t\t\t\t\t$(find "${DIR}/compose/sample_apps" -type f -name '*.yml' -exec basename {} \; | cut -d. -f1 | grep -v https | sort | tr '\n' ',' | sed 's/,$//')"
41-
echo -e "\t-A\t\t\t\t\t\t\tdisable TLS on sample applications' Agents."
42-
echo -e "\t-V\t\t\t\t\t\t\tdo not discard data storage Volumes on exit."
43-
echo -e "\t-X\t\t\t\t\t\t\tdeploy additional development aid tools."
44-
echo -e "\t-c [/path/to/binary]\t\t\t\t\tUse specified Container Engine (default \"\$(command -v podman)\")."
45-
echo -e "\t-b\t\t\t\t\t\t\topen a Browser tab for each running service's first mapped port (ex. auth proxy login, database viewer)"
46-
echo -e "\t-n\t\t\t\t\t\t\tdo Not apply configuration changes, instead emit the compose YAML that would have been used to stdout."
47-
echo -e "\t-k\t\t\t\t\t\t\tdisable TLS on the auth proxy."
48-
echo -e "\t-v\t\t\t\t\t\t\tenable verbose logging. Can be passed multiple times to increase verbosity."
34+
column -t -s% <<< "
35+
%-h% print this Help text.
36+
%-O% Offline mode, do not attempt to pull container images that are already present on this machine.
37+
%-p% disable auth Proxy.
38+
%-s [none,$(ls -1 ${DIR}/compose/s3-*.yml | xargs basename -a | grep -v none | sort | cut -d/ -f2 | cut -d. -f1 | cut -d- -f2 | paste -sd ',' -)]% S3 implementation to spin up (default \"seaweed\").
39+
%-G% exclude Grafana dashboard and jfr-datasource from deployment.
40+
%-r [replicas]% configure a cryostat-reports sidecar instance(s). Optional argument is the number of replicas, which defaults to 1.
41+
%-t [all|comma-list]% include sample applications for Testing. Leave blank or use \"all\" to deploy everything, otherwise use a comma-separated list from: $(find ${DIR}/compose/sample_apps -type f -name '*.yml' -exec basename {} \; | cut -d. -f1 | grep -v https | sort | tr '\n' ',' | sed 's/,$//')
42+
%-A% disable TLS on sample applications' Agents.
43+
%-V% do not discard data storage Volumes on exit.
44+
%-X% deploy additional development aid tools.
45+
%-c [/path/to/binary]% use specified Container engine (default \"\$(command -v podman)\").
46+
%-b% open a Browser tab for each running service's first mapped port (ex. auth proxy login, database viewer).
47+
%-n% do Not apply configuration changes, instead emit the compose YAML that would have been used to stdout.
48+
%-k% disable TLS (inseKure) on the auth proxy.
49+
%-v% enable Verbose logging. Can be passed multiple times to increase verbosity.
50+
"
4951
}
5052
5153
s3=seaweed

0 commit comments

Comments
 (0)