Skip to content

Commit 33e1080

Browse files
committed
Fix get.sh to select between --version and version subcommand
1 parent 94d368e commit 33e1080

File tree

1 file changed

+26
-3
lines changed

1 file changed

+26
-3
lines changed

get.sh

+26-3
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ function check_connectivity() {
6767

6868
function install_pvsadm() {
6969

70+
local major=0
71+
local minor=0
72+
local patch=0
73+
74+
if [[ "$VERSION" =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then
75+
major=${BASH_REMATCH[1]}
76+
minor=${BASH_REMATCH[2]}
77+
patch=${BASH_REMATCH[3]}
78+
fi
79+
7080
if [[ "${FORCE}" -eq 1 ]]; then
7181
if command -v "pvsadm" &> /dev/null; then
7282
rm -f /usr/local/bin/pvsadm
@@ -75,8 +85,7 @@ function install_pvsadm() {
7585

7686
if command -v "pvsadm" &> /dev/null; then
7787
echo "pvsadm is already installed!"
78-
# TODO: move to pvsadm --version for future releases.
79-
pvsadm version
88+
print_version $major $minor $patch
8089
exit 1
8190
fi
8291

@@ -92,7 +101,21 @@ function install_pvsadm() {
92101
fi
93102

94103
chmod +x /usr/local/bin/pvsadm
95-
pvsadm --version
104+
print_version $major $minor $patch
105+
}
106+
107+
function print_version() {
108+
# check if version is < 0.1.18, which uses the pvsadm subcommand
109+
local major=$1
110+
local minor=$2
111+
local patch=$3
112+
if [ $major -lt 1 ] && [ $minor -lt 2 ] && [ $patch -lt 17 ];
113+
then
114+
pvsadm version
115+
# the more recent releases support the version flag
116+
else
117+
pvsadm --version
118+
fi
96119
}
97120

98121
function run (){

0 commit comments

Comments
 (0)