From 0334de55460b8297ba1da2fa1182b83c16cb0e63 Mon Sep 17 00:00:00 2001
From: Kevin Woley <kmwoley@users.noreply.github.com>
Date: Thu, 13 Feb 2020 23:04:46 -0800
Subject: [PATCH] bug fix: previous shadow copy could be backed up

If the previous run of the script were aborted, the shadow copy would be left aroudn and then backed up.
---
 backup.ps1 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/backup.ps1 b/backup.ps1
index 234f3a7..8dd1c91 100644
--- a/backup.ps1
+++ b/backup.ps1
@@ -127,18 +127,20 @@ function Invoke-Backup {
     $starting_location = Get-Location
     ForEach ($item in $BackupSources.GetEnumerator()) {
 
-        # Create the Shadow Copy
-        $s1 = (Get-WmiObject -List Win32_ShadowCopy).Create($item.Key, "ClientAccessible")
-        $s2 = Get-WmiObject -Class Win32_ShadowCopy | Where-Object { $_.ID -eq $s1.ShadowID }
-
-        $device  = $s2.DeviceObject + "\"
         $ShadowPath = Join-Path $item.Key 'resticVSS'
-        
-        # Create a symbolic link to the shadow copy
+
+        # check for existance of previous, orphaned VSS directory (and remove it) before creating the shadow copy
         if(Test-Path $ShadowPath) {
             Write-Output "[[Backup]] VSS directory exists: '$ShadowPath' - removing. Past script failure?" | Tee-Object -Append $ErrorLog | Tee-Object -Append $SuccessLog
             cmd /c rmdir $ShadowPath
         }
+        
+        # Create the shadow copy
+        $s1 = (Get-WmiObject -List Win32_ShadowCopy).Create($item.Key, "ClientAccessible")
+        $s2 = Get-WmiObject -Class Win32_ShadowCopy | Where-Object { $_.ID -eq $s1.ShadowID }
+        
+        # Create a symbolic link to the shadow copy
+        $device  = $s2.DeviceObject + "\"
         cmd /c mklink /d $ShadowPath "$device" 3>&1 2>> $ErrorLog | Tee-Object -Append $SuccessLog
 
         # Build the new list of folders