Support "Move-Generation2Master" script for full path input (#13660)

* Support "Move-Generation2Master" script for full path input * Unified path
Azure · Dec 7, 2020 · a94b472 · a94b472
1 parent c624a64
commit a94b472
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/tools/Gen2Master/MoveFromGeneration2Master.ps1 b/tools/Gen2Master/MoveFromGeneration2Master.ps1
@@ -8,7 +8,7 @@ Function Move-Generation2Master {
 
     process {
         $ModuleName = ($SourcePath.Trim("\").Split("\"))[-1]
-        If (-not ($DestPath -Match $ModuleName)) {
+        If (-not ($DestPath.Trim("\").Split("\"))[-1] -eq $ModuleName)) {
             $DestPath = Join-Path -Path $DestPath -ChildPath $ModuleName
         }
         If (-not (Test-Path $DestPath)) {
@@ -67,7 +67,8 @@ Function Move-Generation2Master {
             $Psd1Metadata.GUID = $ModuleGuid
         }
         If ($Null -eq $RequiredModule) {
-            $AccountsModulePath = [System.IO.Path]::Combine($DestPath, '..', 'Accounts', 'Accounts')
+            $FullDestPath = Resolve-Path -path $DestPath
+            $AccountsModulePath = [System.IO.Path]::Combine($FullDestPath, 'Accounts', 'Accounts')
             $AccountsMetadata = Import-LocalizedData -BaseDirectory $AccountsModulePath -FileName "Az.Accounts.psd1"
             $RequiredModule = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = $AccountsMetadata.ModuleVersion; })
         }