iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "azure-cli output config check added" 

This reverts commit 0f0fc1b99c.
This commit is contained in:
andrew-best-diaxion 2018-04-16 07:45:17 +10:00
parent 0f0fc1b99c
commit e911f03b6d
1 changed files with 192 additions and 202 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/azure-setup.sh
View File

@ -12,7 +12,6 @@ azure_tenant_id= # Derived from the account after login
location= location=
azure_object_id= azure_object_id=
azureversion= azureversion=
azurecliconfig=
create_sleep=10 create_sleep=10
showhelp() { showhelp() {
@ -60,15 +59,6 @@ requirements() {
echo "Alternatively, you can use the Cloud Shell https://docs.microsoft.com/en-us/azure/cloud-shell/overview right from the Azure Portal or even VS Code." echo "Alternatively, you can use the Cloud Shell https://docs.microsoft.com/en-us/azure/cloud-shell/overview right from the Azure Portal or even VS Code."
fi fi
azurecliconfig=$(cat $HOME/.azure/config | grep output | awk -F'[ ]' '{print $3}')
if [ "$azurecliconfig" == "json" ]; then
found=$((found +1))
echo "Found correct azure-cli output configuration: output = $azurecliconfig."
else
echo "azure-cli is configured for $azurecliconfig output."
echo "Please reconfigure your azure-cli client to output using json."
fi
jqversion=$(jq --version) jqversion=$(jq --version)
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
found=$((found + 1)) found=$((found + 1))
@ -78,7 +68,7 @@ requirements() {
echo "https://stedolan.github.io/jq/" echo "https://stedolan.github.io/jq/"
fi fi
if [ $found -lt 3 ]; then if [ $found -lt 2 ]; then
exit 1 exit 1
fi fi
} }