ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/vm_setup.sh: use $package_manager var instead of $PACKAGEMNG

Browse Source 
When trying to find out parameters through "--help",
the $PACKAGEMNG is "undefined".
So the output from help does not make sense.

Change it so that the help message uses $package_manager that
was detected.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Ia7ac47dec810588dfa01441b35204a7bf13280ed
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3049
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Michal Berger <michalx.berger@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Tomasz Zawadzki 2020-06-25 03:35:13 -04:00
parent 7ea417e5a3
commit 82540a6fd1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/common/config/vm_setup.sh
View File

@ -37,11 +37,9 @@ fi
if [ $(uname -s) == "FreeBSD" ]; then if [ $(uname -s) == "FreeBSD" ]; then
OSID="freebsd" OSID="freebsd"
OSVERSION=$(freebsd-version | cut -d. -f1) OSVERSION=$(freebsd-version | cut -d. -f1)
PACKAGEMNG='pkg'
else else
OSID=$(source /etc/os-release && echo $ID) OSID=$(source /etc/os-release && echo $ID)
OSVERSION=$(source /etc/os-release && echo $VERSION_ID) OSVERSION=$(source /etc/os-release && echo $VERSION_ID)
PACKAGEMNG='undefined'
fi fi
function usage() { function usage() {
@ -50,8 +48,8 @@ function usage() {
echo "" echo ""
echo "./vm_setup.sh" echo "./vm_setup.sh"
echo " -h --help" echo " -h --help"
echo " -u --upgrade Run $PACKAGEMNG upgrade" echo " -u --upgrade Run $package_manager upgrade"
echo " -i --install-deps Install $PACKAGEMNG based dependencies" echo " -i --install-deps Install $package_manager based dependencies"
echo " -t --test-conf List of test configurations to enable (${CONF})" echo " -t --test-conf List of test configurations to enable (${CONF})"
echo " -c --conf-path Path to configuration file" echo " -c --conf-path Path to configuration file"
echo " -d --dir-git Path to where git sources should be saved" echo " -d --dir-git Path to where git sources should be saved"
@ -77,6 +75,7 @@ elif hash pkg &> /dev/null; then
else else
echo "Supported package manager not found. Script supports:" echo "Supported package manager not found. Script supports:"
printf ' * %s\n' "${managers[@]##*/}" printf ' * %s\n' "${managers[@]##*/}"
package_manager="undefined"
fi fi
# Parse input arguments # # Parse input arguments #