Skip to content

Commit d1bc844

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

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

get.sh

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

6868
function install_pvsadm() {
6969

70+
local major=0
71+
local minor=0
72+
local patch=0
73+
if egrep '^v[0-9]+\.[0-9]+\.[0-9]+' <<<"${VERSION}" >/dev/null 2>&1 ; then
74+
local n=${VERSION//[!0-9]/ }
75+
local a=(${n//\./ })
76+
major=${a[0]}
77+
minor=${a[1]}
78+
patch=${a[2]}
79+
fi
80+
7081
if [[ "${FORCE}" -eq 1 ]]; then
7182
if command -v "pvsadm" &> /dev/null; then
7283
rm -f /usr/local/bin/pvsadm
@@ -75,8 +86,7 @@ function install_pvsadm() {
7586

7687
if command -v "pvsadm" &> /dev/null; then
7788
echo "pvsadm is already installed!"
78-
# TODO: move to pvsadm --version for future releases.
79-
pvsadm version
89+
print_version $major $minor $patch
8090
exit 1
8191
fi
8292

@@ -92,7 +102,21 @@ function install_pvsadm() {
92102
fi
93103

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

98122
function run (){

0 commit comments

Comments
 (0)