1berry/docker-compose
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #615 from docker/fix_linux_install

Browse Source 
Fix linux install script parsing version
This commit is contained in:
Guillaume Tardif 2020-09-14 18:14:42 +02:00 committed by GitHub
commit 4ce1fafc0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/install/install_linux.sh
View File

@ -33,10 +33,14 @@ manual_install() {
} }
is_new_cli() { is_new_cli() {
azure_version_str="$($1 version 2>/dev/null | grep 'Azure' || true)" cloud_version_str="$($1 version 2>/dev/null | grep 'Cloud integration' || true)"
if [ -n "$azure_version_str" ]; then if [ -n "$cloud_version_str" ]; then
echo 1 echo 1
else else
azure_version_str="$($1 version 2>/dev/null | grep 'Azure' || true)"
if [ -n "$azure_version_str" ]; then
echo 1
fi
echo 0 echo 0
fi fi
} }