Commit d1bc844 1 parent 94d368e commit d1bc844 Copy full SHA for d1bc844
File tree 1 file changed +27
-3
lines changed
1 file changed +27
-3
lines changed Original file line number Diff line number Diff line change @@ -67,6 +67,17 @@ function check_connectivity() {
67
67
68
68
function install_pvsadm() {
69
69
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
+
70
81
if [[ " ${FORCE} " -eq 1 ]]; then
71
82
if command -v " pvsadm" & > /dev/null; then
72
83
rm -f /usr/local/bin/pvsadm
@@ -75,8 +86,7 @@ function install_pvsadm() {
75
86
76
87
if command -v " pvsadm" & > /dev/null; then
77
88
echo " pvsadm is already installed!"
78
- # TODO: move to pvsadm --version for future releases.
79
- pvsadm version
89
+ print_version $major $minor $patch
80
90
exit 1
81
91
fi
82
92
@@ -92,7 +102,21 @@ function install_pvsadm() {
92
102
fi
93
103
94
104
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
96
120
}
97
121
98
122
function run (){
You can’t perform that action at this time.
0 commit comments