Skip to content

Commit 2e35775

Browse files
stankovskistankovski
committed
Merge pull request #1590 from yugangw-msft/rename
Rename azure.sh to az.sh
2 parents 364a997 + 08603ee commit 2e35775

17 files changed

+66
-63
lines changed

‎build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
DependsOnTargets="Build;Test" >
186186
<Exec Command="$(LibraryToolsFolder)\CLU\BuildAndInstallClu.bat" />
187187
<!--do a simple verification-->
188-
<Exec Command="$(LibraryRoot)drop\clurun\win7-x64\azure.bat help" />
188+
<Exec Command="$(LibraryRoot)drop\clurun\win7-x64\az.bat help" />
189189
</Target>
190190

191191
<Target Name="BuildMsBuildTask" DependsOnTargets="RestoreNugetPackages">

‎examples/compute-management/01-VirtualMachineSizes.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ set -e
33
printf "\n=== Managing Virtual Machine Sizes in Azure Compute ===\n"
44

55
printf "\n1. Showing VM size results in location: %s.\n" "$location"
6-
azure vmsize get --location "$location"
6+
az vmsize get --location "$location"
77

88
printf "\n2. Checking VM size results in location: %s.\n" "$location"
9-
vmSizeResult=`azure vmsize get --location "$location"`
9+
vmSizeResult=`az vmsize get --location "$location"`
1010

1111
if [[ $vmSizeResult == "" ]]; then
1212
echo "Failure: No VM sizes!" 1>&2
@@ -15,23 +15,23 @@ else
1515
echo "Success: Non-empty Results."
1616
fi
1717

18-
filterResult=`azure vmsize get --location "$location" | cat | jq 'select(.name | contains("Standard_A0"))' --raw-output`
18+
filterResult=`az vmsize get --location "$location" | cat | jq 'select(.name | contains("Standard_A0"))' --raw-output`
1919
if [[ "$filterResult" == "" ]]; then
2020
echo "Failure: Standard_A0 vm size not found." 1>&2
2121
exit 1
2222
else
2323
echo "Success: Standard_A0 vm size found."
2424
fi
2525

26-
filterResult=`azure vmsize get --location "$location" | cat | jq 'select(.name | contains("Standard_G1"))' --raw-output`
26+
filterResult=`az vmsize get --location "$location" | cat | jq 'select(.name | contains("Standard_G1"))' --raw-output`
2727
if [[ "$filterResult" == "" ]]; then
2828
echo "Failure: Standard_G1 vm size not found." 1>&2
2929
exit 1
3030
else
3131
echo "Success: Standard_G1 vm size found."
3232
fi
3333

34-
filterResult=`azure vmsize get --location "$location" | cat | jq 'select(.name | contains("NonStandard_A1"))' --raw-output`
34+
filterResult=`az vmsize get --location "$location" | cat | jq 'select(.name | contains("NonStandard_A1"))' --raw-output`
3535
if [[ "$filterResult" == "" ]]; then
3636
echo "Success: NonStandard_A1 vm size not found."
3737
else

‎examples/compute-management/02-VirtualMachineCreation.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ set -e
33
printf "\n=== Managing Virtual Machine Creation in Azure Compute ===\n"
44

55
printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
6-
azure group create -n "$groupName" --location "$location"
6+
az group create -n "$groupName" --location "$location"
77

88
printf "\n2. Creating a new storage account '%s' in type '%s'.\n" "$storageAccountName" "$storageAccountType"
9-
azure storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
9+
az storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
1010

1111
printf "\n3. Create virtual network.\n"
12-
result=`azure virtual network new --resourcegroupname "$groupName" --name test --location "$location" --addressprefix "[\"10.0.0.0/16\"]" --subnet "[{\"Name\":\"test\",\"AddressPrefix\":\"10.0.0.0/24\"}]" --force`
12+
result=`az virtual network new --resourcegroupname "$groupName" --name test --location "$location" --addressprefix "[\"10.0.0.0/16\"]" --subnet "[{\"Name\":\"test\",\"AddressPrefix\":\"10.0.0.0/24\"}]" --force`
1313

14-
contextResult=`azure context get`
14+
contextResult=`az context get`
1515

1616
subId=`echo $contextResult | jq '.Subscription.SubscriptionId' --raw-output`
1717

1818
subnetId="/subscriptions/$subId/resourceGroups/$groupName/providers/Microsoft.Network/virtualNetworks/test/subnets/test"
1919

2020
printf "\n4. Create network interface with:\r\nsubId='%s' \r\n& \r\nsubnetId='$subnetId'.\n" "$subId"
2121
export MSYS_NO_PATHCONV=1
22-
azure network interface new --name test --resourcegroupname "$groupName" --location "$location" --subnetid "$subnetId"
22+
az network interface new --name test --resourcegroupname "$groupName" --location "$location" --subnetid "$subnetId"
2323
export MSYS_NO_PATHCONV=
2424

2525
nicId="/subscriptions/$subId/resourceGroups/$groupName/providers/Microsoft.Network/networkInterfaces/test"
@@ -30,7 +30,7 @@ vmStr="{\"Name\":\"test\",\"HardwareProfile\":{\"VmSize\":\"Standard_A1\"},\"Net
3030

3131
printf "\n5. Create virtual machine with\r\nnicId='%s'\r\nvhdUri='%s'\r\nvmStr='%s'\n" "$nicId" "$vhdUri" "$vmStr"
3232

33-
azure vm new --resourcegroupname "$groupName" --location "$location" --vmprofile "$vmStr"
33+
az vm new --resourcegroupname "$groupName" --location "$location" --vmprofile "$vmStr"
3434

3535
printf "\n6. Removing resource group: %s.\n" "$groupName"
36-
azure group remove -n "$groupName" -f
36+
az group remove -n "$groupName" -f

‎examples/lib/loginService.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
azure account add --spn --appid "$spn" --secret "$secret" -t "$tenant" -s "$spnSubscription"
2+
az account add --spn --appid "$spn" --secret "$secret" -t "$tenant" -s "$spnSubscription"

‎examples/lib/loginUser.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
azure account add -u "$azureUser" -p "$password" -s "$userSubscription"
2+
az account add -u "$azureUser" -p "$password" -s "$userSubscription"

‎examples/lib/testrunner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ for d in $( ls $TESTDIR/.. --ignore=lib ); do
1515
. $f
1616
set +e
1717
printf "\nCleanup: removing resource group: %s\n" $groupName
18-
azure group remove --name "$groupName" --force
18+
az group remove --name "$groupName" --force
1919
set -e
2020
echo "success: $f"
2121
done

‎examples/resource-management/01-ResourceGroups.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ set -e
33
printf "\n=== Managing Resource Groups in Azure ===\n"
44

55
printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
6-
azure group create -n "$groupName" --location "$location"
6+
az group create -n "$groupName" --location "$location"
77

88
printf "\n2. Updating the group %s with tags.\n" "$groupName"
9-
azure group set -n "$groupName" --tags "[{\"Value\":\"testval\",\"Name\":\"testtag\"}]"
9+
az group set -n "$groupName" --tags "[{\"Value\":\"testval\",\"Name\":\"testtag\"}]"
1010

1111
printf "\n3. Get information about resource group : %s.\n" "$groupName"
12-
resourceGroupInfo=`azure group get -n $groupName`
12+
resourceGroupInfo=`az group get -n $groupName`
1313

1414
printf "\nValidating resource group name is: %s\n" "$groupName"
1515
[ $(echo $resourceGroupInfo | jq '.ResourceGroupName' --raw-output) == "$groupName" ]
1616

1717
printf "\n4. Listing all resource groups in the subscription.\n"
18-
azure group get
18+
az group get
1919

2020
printf "\n5. Removing resource group: %s.\n" "$groupName"
21-
azure group remove -n "$groupName" -f
21+
az group remove -n "$groupName" -f

‎examples/resource-management/02-Resource.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,44 +3,44 @@ set -e
33
printf "\n=== Managing Resources in Azure ===\n"
44

55
printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
6-
azure group create --name "$groupName" --location "$location"
6+
az group create --name "$groupName" --location "$location"
77
destinationGroupName=$groupName"Destination"
88

99
printf "\n2. Registering Resource Provider Namespace.\n"
1010
providerNamespace="Providers.Test"
11-
azure resource provider register --ProviderNamespace $providerNamespace --Force
11+
az resource provider register --ProviderNamespace $providerNamespace --Force
1212

1313
printf "\n3. Creating a new Resource: %s.\n" "$resourceName"
1414
resourceType="$providerNamespace/statefulResources"
1515
tags='[{"Name": "testtag", "Value": "testvalue"}]'
1616
properties='{"administratorLogin": "adminuser", "administratorLoginPassword": "P@ssword1"}'
1717
apiversion="2014-04-01"
18-
azure resource create --Name $resourceName --Location $location --Tags "$tags" --ResourceGroupName $groupName --ResourceType $resourceType --PropertyObject "$properties" --ApiVersion $apiversion --Force
18+
az resource create --Name $resourceName --Location $location --Tags "$tags" --ResourceGroupName $groupName --ResourceType $resourceType --PropertyObject "$properties" --ApiVersion $apiversion --Force
1919

2020
printf "\n4. Get information about Resource : %s.\n" "$resourceName"
21-
resourceInfo=$(azure resource get -n $resourceName)
21+
resourceInfo=$(az resource get -n $resourceName)
2222
printf "\nValidating Resource name is: %s\n" "$resourceName"
2323
[ $(echo $resourceInfo | jq '.Name' --raw-output) == "$resourceName" ]
2424

2525
printf "\n5. Find Resource with name '%s' and type '%s'.\n" "$resourceName" "$resourceType"
26-
foundResource=$(azure resource find -n "$resourceName" -t $resourceType)
26+
foundResource=$(az resource find -n "$resourceName" -t $resourceType)
2727
printf "\nValidating Resource name is: %s.\n" "$resourceName"
2828
[ $(echo $foundResource | jq '.Name' --raw-output) == "$resourceName" ]
2929

3030
printf "\n6. Update Resource.\n"
3131
tagsUpdate='[{"Name": "testtagUpdated", "Value": "testvalueUpdated"}]'
32-
azure resource set --ResourceGroupName $groupName --ResourceName $resourceName --ResourceType $resourceType --Tags "$tagsUpdate" -f
32+
az resource set --ResourceGroupName $groupName --ResourceName $resourceName --ResourceType $resourceType --Tags "$tagsUpdate" -f
3333

3434
printf "\n7. Move Resource to resource group: %s.\n" "$destinationGroupName"
35-
azure group create --name "$destinationGroupName" --location "$location"
35+
az group create --name "$destinationGroupName" --location "$location"
3636
resourceId=$(echo $resourceInfo | jq '.Id')
3737
arrayId="[$resourceId]"
38-
azure resource move -g "$destinationGroupName" --ResourceId "$arrayId" -f
38+
az resource move -g "$destinationGroupName" --ResourceId "$arrayId" -f
3939

4040
printf "\n8. Removing resource: %s.\n" "$resourceName"
41-
foundResource=$(azure resource find -n "$resourceName" -t $resourceType)
41+
foundResource=$(az resource find -n "$resourceName" -t $resourceType)
4242
resourceId=$(echo $foundResource | jq '.Id' --raw-output)
4343
echo $resourceId
4444
export MSYS_NO_PATHCONV=1
45-
azure resource remove --Id "$resourceId" -f
45+
az resource remove --Id "$resourceId" -f
4646
export MSYS_NO_PATHCONV=

‎examples/resource-management/03-Deployments.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ set -e
33
printf "\n=== Provisioning Deployments in Azure ===\n"
44

55
printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
6-
azure group create --name "$groupName" --location "$location"
6+
az group create --name "$groupName" --location "$location"
77

88
printf "\n2. Test template with dynamic parameters\n"
9-
azure group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --siteName "$resourceName" --hostingPlanName "$resourceName" --siteLocation "$location" --workerSize "0"
9+
az group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --siteName "$resourceName" --hostingPlanName "$resourceName" --siteLocation "$location" --workerSize "0"
1010

1111
printf "\n3. Test template with JSON parameter object\n"
12-
azure group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$resourceName\",\"hostingPlanName\":\"$resourceName\",\"siteLocation\":\"$location\",\"workerSize\": 0 }"
12+
az group deployment test -g "$groupName" --templatefile $BASEDIR/sampleTemplate.json --templateparameterobject "{\"siteName\":\"$resourceName\",\"hostingPlanName\":\"$resourceName\",\"siteLocation\":\"$location\",\"workerSize\": 0 }"
1313

1414
printf "\n4. Provisioning Deployment\n"
15-
deploymentInfo=`azure group deployment create --Name "$resourceName" --ResourceGroupName "$groupName" --TemplateFile $BASEDIR/sampleTemplate.json --TemplateParameterFile $BASEDIR/sampleTemplateParams.json`
15+
deploymentInfo=`az group deployment create --Name "$resourceName" --ResourceGroupName "$groupName" --TemplateFile $BASEDIR/sampleTemplate.json --TemplateParameterFile $BASEDIR/sampleTemplateParams.json`
1616
echo $deploymentInfo

‎examples/resource-management/04-RoleAssignments.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@ set -e
33
printf "\n=== Managing Role Assignments in Azure ===\n"
44

55
printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
6-
azure group create --name "$groupName" --location "$location"
6+
az group create --name "$groupName" --location "$location"
77

88
printf "\n2. Creating a new Role Assignment.\n"
99
export MSYS_NO_PATHCONV=1
10-
users=$(azure ad users get)
10+
users=$(az ad users get)
1111
userId=$(echo $users | cat | jq '.[0].Id' -s --raw-output)
1212
echo "UserID: $userId"
13-
roleDefinitions=$(azure role definition get)
13+
roleDefinitions=$(az role definition get)
1414
roleDefinitionId=$(echo $roleDefinitions | cat | jq '.[0].Id' -s --raw-output)
1515
echo "RoleDefinitionId: $roleDefinitionId"
16-
subsciptions=$(azure subscription get)
16+
subsciptions=$(az subscription get)
1717
subscriptionId=$(echo $subsciptions | cat | jq '.[0].SubscriptionId' -s --raw-output)
1818
scope="/subscriptions/$subscriptionId/resourceGroups/$groupName"
1919
echo "Scope: $scope"
20-
azure role assignment create --ObjectId "$userId" --RoleDefinitionId "$roleDefinitionId" --Scope "$scope"
20+
az role assignment create --ObjectId "$userId" --RoleDefinitionId "$roleDefinitionId" --Scope "$scope"
2121

2222
printf "\n3. Delete last created Role Assignment.\n"
23-
assignments=$(azure role assignment get)
23+
assignments=$(az role assignment get)
2424
assignmentId=$(echo $assignments | cat | jq '.[-1:][0].ObjectId' -s --raw-output)
2525
echo "Deleting assignment: $assignmentId"
26-
azure role assignment remove --ObjectId "$assignmentId" --Scope "$scope" --RoleDefinitionId "$roleDefinitionId" -f
26+
az role assignment remove --ObjectId "$assignmentId" --Scope "$scope" --RoleDefinitionId "$roleDefinitionId" -f
2727
export MSYS_NO_PATHCONV=

‎examples/resource-management/05-RoleDefinitions.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ set -e
33
printf "\n=== Managing Role Definitions in Azure ===\n"
44

55
printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
6-
azure group create --name "$groupName" --location "$location"
6+
az group create --name "$groupName" --location "$location"
77

88
printf "\n2. Creating a new Role Definition.\n"
9-
roleDefinition=$(azure role definition create --inputfile $BASEDIR/roleDefinition.json)
9+
roleDefinition=$(az role definition create --inputfile $BASEDIR/roleDefinition.json)
1010

1111
printf "\n3. Get information about Role Definitions.\n"
1212
roleDefinitionName=$(echo $roleDefinition | jq '.Name' --raw-output)
13-
azure role definition get -n $roleDefinitionName
13+
az role definition get -n $roleDefinitionName
1414

1515
printf "\n4. Update Role Definition.\n"
1616
export MSYS_NO_PATHCONV=1
1717
updatedRoleDefinition=$(echo $roleDefinition | jq '.Actions |= .+ ["Microsoft.Authorization/*/write"]')
18-
azure role definition set --Role "$updatedRoleDefinition"
18+
az role definition set --Role "$updatedRoleDefinition"
1919

2020
printf "\n5. Delete Role Definition.\n"
2121
roleDefinitionId=$(echo $roleDefinition | jq '.Id' --raw-output)
22-
azure role definition remove --Id $roleDefinitionId --PassThru -f
22+
az role definition remove --Id $roleDefinitionId --PassThru -f
2323
export MSYS_NO_PATHCONV=

‎examples/virtual-hard-disk/01-VirtualHardDisks.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ set -e
33
printf "\n=== Managing Virtual Hard Disks in Azure Compute ===\n"
44

55
printf "\n1. Creating a new resource group: %s and location: %s.\n" "$groupName" "$location"
6-
azure group create -n "$groupName" --location "$location"
6+
az group create -n "$groupName" --location "$location"
77

88
printf "\n2. Creating a new storage account '%s' in type '%s'.\n" "$storageAccountName" "$storageAccountType"
9-
azure storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
9+
az storage account new --resourcegroupname "$groupName" --name "$storageAccountName" --location "$location" --type "$storageAccountType"
1010

1111
printf "\n3. Uploading a virtual hard disk to: %s.\n" "$storageAccountName"
12-
azure vhd add -o --resourcegroupname "$groupName" --destination https://"$storageAccountName".blob.core.windows.net/test/test.vhd --localfilepath $BASEDIR/test.vhd
12+
az vhd add -o --resourcegroupname "$groupName" --destination https://"$storageAccountName".blob.core.windows.net/test/test.vhd --localfilepath $BASEDIR/test.vhd
1313

1414
printf "\n4. Downloading a virtual hard disk"
15-
azure vhd save -o --resourcegroupname "$groupName" --sourceuri https://"$storageAccountName".blob.core.windows.net/test/test.vhd --localfilepath ./test_downloaded_by_clu.vhd
15+
az vhd save -o --resourcegroupname "$groupName" --sourceuri https://"$storageAccountName".blob.core.windows.net/test/test.vhd --localfilepath ./test_downloaded_by_clu.vhd
1616

1717
printf "\n5. Validating the downloaded file is the same.\n"
1818
diffResult=`diff ./test_downloaded_by_clu.vhd $BASEDIR/test_uploaded_byps.vhd`
@@ -25,4 +25,4 @@ else
2525
fi
2626

2727
printf "\n6. Removing resource group: %s.\n" "$groupName"
28-
azure group remove -n "$groupName" -f
28+
az group remove -n "$groupName" -f

‎src/CLU/Microsoft.CLU.Run/PackageManagementMode.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,7 @@ private static void GenerateScript(string cfgPath)
534534
{
535535
var scriptPath = GetScriptPath(cfgPath);
536536
var scriptName = Path.GetFileNameWithoutExtension(scriptPath);
537+
var ScriptBaseName = "az";
537538

538539
if (File.Exists(scriptPath))
539540
return;
@@ -544,7 +545,7 @@ private static void GenerateScript(string cfgPath)
544545
{
545546
"#!/bin/bash",
546547
"SCRIPTPATH=$(dirname \"$0\")",
547-
$"$SCRIPTPATH/clurun -s {scriptName} -r $SCRIPTPATH/{Path.GetFileName(cfgPath)} \"$@\""
548+
$"$SCRIPTPATH/clurun -s {ScriptBaseName} -r $SCRIPTPATH/{Path.GetFileName(cfgPath)} \"$@\""
548549
});
549550
System.Diagnostics.Process.Start("chmod", $"777 {scriptPath}");
550551
}
@@ -553,7 +554,7 @@ private static void GenerateScript(string cfgPath)
553554
File.WriteAllLines(scriptPath, new string[]
554555
{
555556
"@echo off",
556-
$@"%~dp0\clurun.exe -s {scriptName} -r %~dp0\{Path.GetFileName(cfgPath)} %*"
557+
$@"%~dp0\clurun.exe -s {ScriptBaseName} -r %~dp0\{Path.GetFileName(cfgPath)} %*"
557558
});
558559
}
559560
}

‎tools/CLU/BuildAndInstallClu.bat

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@ echo ^(Get-Content "%mscluCfg%"^) ^| ForEach-Object { $_ -replace "TOFILL", "%ro
3636
%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Management.Storage
3737
%root%\drop\clurun\win7-x64\clurun.exe --install Microsoft.Azure.Commands.Compute
3838

39+
rename %root%\drop\clurun\win7-x64\azure.bat az.bat
40+
3941
REM setup osx and linux bits which can be xcopied and run.
4042
REM note, for known nuget bugs, skip --install by copying over cmdlet packages.
4143
xcopy %root%\drop\clurun\win7-x64\pkgs %root%\drop\clurun\osx.10.10-x64\pkgs /S /Q /I /Y
4244
copy /Y %root%\drop\clurun\win7-x64\azure.lx %root%\drop\clurun\osx.10.10-x64
4345
copy /Y %root%\drop\clurun\win7-x64\msclu.cfg %root%\drop\clurun\osx.10.10-x64
4446

45-
REM: copy over the pre-cooked azure.sh and ensure correct line endings
46-
copy /Y %~dp0\azure.sh %root%\drop\clurun\osx.10.10-x64\azure
47-
set azuresh=%root%\drop\clurun\osx.10.10-x64\azure
47+
REM: copy over the pre-cooked az.sh and ensure correct line endings
48+
copy /Y %~dp0\az.sh %root%\drop\clurun\osx.10.10-x64\az
49+
set azuresh=%root%\drop\clurun\osx.10.10-x64\az
4850
echo Get-ChildItem %azuresh% ^| ForEach-Object { > %temp%\fixLineEndings.ps1
4951
echo $contents = [IO.File]::ReadAllText($_) -replace "`r`n?", "`n" >> %temp%\fixLineEndings.ps1
5052
echo [IO.File]::WriteAllText($_, $contents) >> %temp%\fixLineEndings.ps1
@@ -54,7 +56,7 @@ echo } >> %temp%\fixLineEndings.ps1
5456
xcopy %root%\drop\clurun\win7-x64\pkgs %root%\drop\clurun\ubuntu.14.04-x64\pkgs /S /Q /I /Y
5557
copy /Y %root%\drop\clurun\win7-x64\azure.lx %root%\drop\clurun\ubuntu.14.04-x64
5658
copy /Y %root%\drop\clurun\win7-x64\msclu.cfg %root%\drop\clurun\ubuntu.14.04-x64
57-
copy /Y %azuresh% %root%\drop\clurun\ubuntu.14.04-x64\azure
59+
copy /Y %azuresh% %root%\drop\clurun\ubuntu.14.04-x64\az
5860

5961
REM, windows version also needs it for bash based testing
60-
copy /Y %~dp0\azure.win.sh %root%\drop\clurun\win7-x64\azure
62+
copy /Y %~dp0\az.win.sh %root%\drop\clurun\win7-x64\az

‎tools/CLU/SetupEnv.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ REM build cmdlets packages
55
set DebugCLU=
66
call %~dp0\BuildAndInstallClu.bat
77
set Path=%Path%;%CLUROOT%\drop\clurun\win7-x64
8-
REM run 'azure help' to verify all are wired up
9-
azure.bat help
8+
REM run 'az help' to verify all are wired up
9+
az.bat help
1010
if ERRORLEVEL 1 (
1111
echo Build and deploy clu package failed
1212
exit /B 1

‎tools/CLU/azure.sh renamed to ‎tools/CLU/az.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ then
44
export CmdletSessionID=$PPID
55
fi
66
SCRIPTPATH=$(dirname "$0")
7-
$SCRIPTPATH/clurun -s azure -r $SCRIPTPATH/azure.lx "$@"
7+
$SCRIPTPATH/clurun -s az -r $SCRIPTPATH/azure.lx "$@"

0 commit comments

Comments
 (0)