Merge pull request #5 from sanderstad/development

Bugs repaired with remove commands

Author: sanderstad

PSDatabaseClone.psd1

@@ -3,7 +3,7 @@
     ModuleToProcess    = 'PSDatabaseClone.psm1'
 
     # Version number of this module.
-    ModuleVersion      = '0.1.0.0'
+    ModuleVersion      = '0.1.47'
 
     # ID used to uniquely identify this module
     GUID               = '747980ca-0d3d-4529-b4fd-e6cdd059c62a'

PSDatabaseClone.psm1

@@ -1,5 +1,5 @@
 $script:ModuleRoot = $PSScriptRoot
-$script:ModuleVersion = "0.1.0.0"
+$script:ModuleVersion = "0.1.47"
 
 function Import-ModuleFile
 {

functions/clone/Remove-PSDCClone.ps1

@@ -227,11 +227,11 @@
                             $null = Dismount-VHD -Path $item.CloneLocation -Credential $Credential
                         }
                         else {
-                            $command = [ScriptBlock]::Create("Test-Path -Path $($item.CloneLocation)")
-                            Write-PSFMessage -Message "Dismounting disk $($item.CloneLocation) from $($item.HostName)" -Level Verbose
+                            $command = [ScriptBlock]::Create("Test-Path -Path '$($item.CloneLocation)'")
+                            Write-PSFMessage -Message "Dismounting disk '$($item.CloneLocation)' from $($item.HostName)" -Level Verbose
                             $result = Invoke-PSFCommand -ComputerName $item.HostName -ScriptBlock $command -Credential $Credential
                             #if (-not $result) {
-                            $command = [scriptblock]::Create("Dismount-VHD -Path `"$($item.CloneLocation)`"")
+                            $command = [scriptblock]::Create("Dismount-VHD -Path '$($item.CloneLocation)'")
                             $null = Invoke-PSFCommand -ComputerName $item.HostName -ScriptBlock $command -Credential $Credential
                             #}
                         }
@@ -246,18 +246,18 @@
                     try {
                         if ($computer.IsLocalhost) {
                             Write-PSFMessage -Message "Removing vhd access path" -Level Verbose
-                            $null = Remove-Item -Path $item.AccessPath -Credential $Credential -Force
+                            $null = Remove-Item -Path "$($item.AccessPath)" -Credential $Credential -Force
 
                             Write-PSFMessage -Message "Removing vhd" -Level Verbose
-                            $null = Remove-Item -Path $item.CloneLocation -Credential $Credential -Force
+                            $null = Remove-Item -Path "$($item.CloneLocation)" -Credential $Credential -Force
                         }
                         else {
                             Write-PSFMessage -Message "Removing vhd access path" -Level Verbose
-                            $command = [scriptblock]::Create("Remove-Item -Path $($item.AccessPath) -Force")
+                            $command = [scriptblock]::Create("Remove-Item -Path '$($item.AccessPath)' -Force")
                             $null = Invoke-PSFCommand -ComputerName $item.HostName -ScriptBlock $command -Credential $Credential
 
                             Write-PSFMessage -Message "Removing vhd" -Level Verbose
-                            $command = [scriptblock]::Create("Remove-Item -Path $($item.CloneLocation) -Force")
+                            $command = [scriptblock]::Create("Remove-Item -Path '$($item.CloneLocation)' -Force")
                             $null = Invoke-PSFCommand -ComputerName $item.HostName -ScriptBlock $command -Credential $Credential
                         }
                     }
@@ -287,7 +287,7 @@
                         $newCloneData = $cloneData | Where-Object {$_.CloneID -ne $item.CloneID}
 
                         # Set the clone file
-                        $jsonCloneFile = "JSONFolder:\clones.json"
+                        $jsonCloneFile = "PSDCJSONFolder:\clones.json"
 
                         # Convert the data back to JSON
                         if($newCloneData.Count -ge 1){

functions/image/New-PSDCImage.ps1

@@ -543,7 +543,14 @@
                 [array]$images = $null
 
                 # Get all the images
-                $images = Get-PSDCImage
+                try{
+                    $images = Get-PSDCImage
+                }
+                catch{
+                    Stop-PSFFunction -Message "Couldn't get images" -Target $imageName -ErrorRecord $_
+                    return
+                }
+
 
                 # Setup the new image id
                 if ($images.Count -ge 1) {

functions/image/Remove-PSDCImage.ps1

@@ -184,7 +184,7 @@
                     # Check the result
                     if ($resultPSRemote.Result) {
 
-                        $command = [scriptblock]::Create("Import-Module PSDatabaseClone")
+                        $command = [scriptblock]::Create("Import-Module PSDatabaseClone -Force")
 
                         try {
                             Invoke-PSFCommand -ComputerName $computer -ScriptBlock $command -Credential $Credential
@@ -237,15 +237,15 @@
                             }
                         }
                         else {
-                            $command = [scriptblock]::Create("Test-Path -Path $($item.ImageLocation)")
+                            $command = [scriptblock]::Create("Test-Path -Path '$($item.ImageLocation)'")
                             $result = Invoke-PSFCommand -ComputerName $computer -ScriptBlock $command -Credential $Credential
 
                             if ($result) {
-                                $command = [scriptblock]::Create("Remove-Item -Path $($item.ImageLocation) -Force")
+                                $command = [scriptblock]::Create("Remove-Item -Path '$($item.ImageLocation)' -Force")
                                 $result = Invoke-PSFCommand -ComputerName $computer -ScriptBlock $command -Credential $Credential
                             }
                             else {
-                                Write-PSFMessage -Message "Couldn't find image $($item.ImageLocation)" -Level Verbose
+                                Write-PSFMessage -Message "Couldn't find image '$($item.ImageLocation)'" -Level Verbose
                             }
                         }
                     }
@@ -273,7 +273,7 @@
                         $imageData = $imageData | Where-Object {$_.ImageID -ne $item.ImageID}
 
                         # Set the image file
-                        $jsonImageFile = "JSONFolder:\images.json"
+                        $jsonImageFile = "PSDCJSONFolder:\images.json"
 
                         # Convert the data back to JSON
                         if ($newImageData.Count -ge 1) {

functions/support/Set-PSDCConfiguration.ps1

@@ -311,8 +311,17 @@
         else {
             # Create the JSON files
 
+            if ($null -eq $filePath) {
+                $filePath = $Path
+            }
+
             # Create the PSDrive to be able to use credentials
-            $null = New-PSDrive -Name PSDatabaseClone -PSProvider FileSystem -Root $filePath -Credential $Credential
+            try {
+                $null = New-PSDrive -Name PSDatabaseClone -PSProvider FileSystem -Root $filePath -Credential $Credential
+            }
+            catch {
+                Stop-PSFFunction -Message "Couldn not create PS-Drive to JSON files" -Target $filePath
+            }
 
             # Create the files
             try {