From 9fe6fd98904a7f7be778f5ed50d191d15d89cf78 Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Wed, 15 Jun 2022 23:45:44 +0000
Subject: [PATCH] create_vbox.sh: cleanup help text formatting

Also added missing single letter options from the Usage
string.  Long options (such as --qemu-emulator) aren't
in the Usage string - leave them off for now, we may
want to consider just eliminating the Usage string
entirely rather than duplicating the options in
the Usage string and the option list below it.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I3d8b53f9395f25b07842d81a2d18c29a104b209e
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/13059
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
---
 scripts/vagrant/create_vbox.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/scripts/vagrant/create_vbox.sh b/scripts/vagrant/create_vbox.sh
index 8a452439c..b428354bf 100755
--- a/scripts/vagrant/create_vbox.sh
+++ b/scripts/vagrant/create_vbox.sh
@@ -17,9 +17,9 @@ SPDK_DIR="$(cd "${DIR}/../../" && pwd)"
 # The command line help
 display_help() {
 	echo
-	echo " Usage: ${0##*/} [-b nvme-backing-file] [-n <num-cpus>] [-s <ram-size>] [-x <http-proxy>] [-hvrldcuf] <distro>"
+	echo " Usage: ${0##*/} [-b nvme-backing-file] [-n <num-cpus>] [-s <ram-size>] [-x <http-proxy>] [-hvrldcufaoH] <distro>"
 	echo
-	echo "  distro = <centos7 | centos8| ubuntu1604 | ubuntu1804 | ubuntu2004 | fedora33 |"
+	echo "  distro = <centos7 | centos8 | ubuntu1604 | ubuntu1804 | ubuntu2004 | fedora33 |"
 	echo "            fedora34 | fedora35 | freebsd11 | freebsd12 | arch | clearlinux | rocky8>"
 	echo
 	echo "  -s <ram-size> in MB             Default: ${SPDK_VAGRANT_VMRAM}"
@@ -45,12 +45,13 @@ display_help() {
 	echo "  --qemu-emulator=<path>          Path to custom QEMU binary. Only works with libvirt provider"
 	echo "  --vagrantfiles-dir=<path>       Destination directory to put Vagrantfile into."
 	echo "  --package-box                   Install all dependencies for SPDK and create a local vagrant box version."
-	echo " --vagrantfile=<path>             Path to a custom Vagrantfile"
+	echo "  --vagrantfile=<path>            Path to a custom Vagrantfile"
 	echo "  -r dry-run"
 	echo "  -h help"
 	echo "  -v verbose"
-	echo "  -f                             Force use of given distro, regardless if it's supported by the script or not."
-	echo "  --box-version                  Version of the vagrant box to select for given distro."
+	echo "  -f                              Force use of given distro, regardless if it's supported by the script or not."
+	echo "  --box-version                   Version of the vagrant box to select for given distro."
+	echo
 	echo " Examples:"
 	echo
 	echo "  $0 -x http://user:password@host:port fedora33"