Fixed install script

Author: stankovski

build.proj

@@ -289,7 +289,7 @@
   </Target>
 
   <!-- Publish all packages -->
-  <Target Name="Publish">
+  <Target Name="Publish" DependsOnTargets="Build">
     <Error Condition=" '$(NuGetKey)' == '' " Text="You must provide the NuGetKey parameter to the build: /p:NuGetKey=YOUR_PUBLISHING_KEY" />
     <Message Importance="high" Text="Publishing Cmdlets..." />
 

setup-powershellget/Setup/ShortcutStartup.ps1

@@ -26,26 +26,19 @@ Finalizing installation of Azure PowerShell.
 Installing Azure Modules from PowerShell Gallery. 
 This may take some time...
 "@
+		$env:PSModulePath = "$env:HOME\Documents\WindowsPowerShell\Modules;$env:ProgramFiles\WindowsPowerShell\Modules;$env:SystemRoot\system32\WindowsPowerShell\v1.0\Modules\"
+
 		Import-Module PackageManagement
 
 		$result = Get-PackageProvider -Name NuGet -ForceBootstrap
 
 		Import-Module PowerShellGet
 
-		$NuGetPublishingSource = $env:NuGetPublishingSource
-		if ([string]::IsNullOrWhiteSpace($NuGetPublishingSource)) {
-			Install-Module Azure
-			Write-Output "Azure $((Get-InstalledModule -Name Azure)[0].Version) installed..."
-			Install-Module AzureRM
-			Write-Output "AzureRM $((Get-InstalledModule -Name AzureRM)[0].Version) installed..."
-			Update-AzureRM
-		} else {
-			Install-Module Azure -Repository $NuGetPublishingSource
-			Write-Output "Azure $((Get-InstalledModule -Name Azure)[0].Version) installed..."
-			Install-Module AzureRM -Repository $NuGetPublishingSource
-			Write-Output "AzureRM $((Get-InstalledModule -Name AzureRM)[0].Version) installed..."
-			Update-AzureRM -Repository $NuGetPublishingSource
-		}
+		Install-Module Azure
+		Write-Output "Azure $((Get-InstalledModule -Name Azure)[0].Version) installed..."
+		Install-Module AzureRM
+		Write-Output "AzureRM $((Get-InstalledModule -Name AzureRM)[0].Version) installed..."
+		Update-AzureRM
 	} else {
 		cd c:\
 		$welcomeMessage = @"

tools/PublishModules.ps1

@@ -15,28 +15,25 @@
 param(
     [Parameter(Mandatory = $false, Position = 0)]
     [string] $buildConfig,
-	[Parameter(Mandatory = $false, Position = 1)]
+    [Parameter(Mandatory = $false, Position = 1)]
     [string] $apiKey,
-	[Parameter(Mandatory = $false, Position = 2)]
-    [string] $repository
+    [Parameter(Mandatory = $false, Position = 2)]
+    [string] $repositoryLocation
 )
 
 if ([string]::IsNullOrEmpty($buildConfig))
 {
-	Write-Verbose "Setting build configuration to 'Release'"
-	$buildConfig = 'Release'
+    Write-Verbose "Setting build configuration to 'Release'"
+    $buildConfig = "Release"
 }
 
 if ([string]::IsNullOrEmpty($repositoryLocation))
 {
-	Write-Verbose "Setting repository location to 'https://dtlgalleryint.cloudapp.net/api/v2'"
+    Write-Verbose "Setting repository location to 'https://dtlgalleryint.cloudapp.net/api/v2'"
 
-    $repository = 'https://dtlgalleryint.cloudapp.net'
+    $repositoryLocation = "https://dtlgalleryint.cloudapp.net/api/v2"
 }
 
-$repositoryLocation = '$repository/api/v2/'
-$repositoryPackageLocation = '$repository/api/v2/package'
-
 
 $packageFolder = "$PSScriptRoot\..\src\Package"
 
@@ -45,7 +42,7 @@ if ($repo -ne $null) {
     $repoName = $repo.Name
 } else {
     $repoName = $(New-Guid).ToString()
-    Register-PSRepository -Name $repoName -SourceLocation $repositoryLocation -PublishLocation $repositoryPackageLocation -InstallationPolicy Trusted
+    Register-PSRepository -Name $repoName -SourceLocation $repositoryLocation -PublishLocation $repositoryLocation/package -InstallationPolicy Trusted
 }
 $modulePath = "$packageFolder\$buildConfig\ServiceManagement\Azure"
 # Publish Azure module
@@ -64,10 +61,10 @@ Write-Host "Published AzureRM.Profile module"
 # Publish AzureRM modules
 $resourceManagerModules = Get-ChildItem -Path "$packageFolder\$buildConfig\ResourceManager\AzureResourceManager" -Directory
 foreach ($module in $resourceManagerModules) {
-	if ($module -ne "AzureRM.Profile") {
-		$modulePath = $module.FullName
-		Write-Host "Publishing $module module from $modulePath"
+    if ($module -ne "AzureRM.Profile") {
+        $modulePath = $module.FullName
+        Write-Host "Publishing $module module from $modulePath"
         Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName -Tags ("Azure", "AzureRM")
-		Write-Host "Published $module module"
-	}
-}
+        Write-Host "Published $module module"
+    }
+}