From 7c36311aa973c4189a68c4eae4191fa8bf9417e9 Mon Sep 17 00:00:00 2001
From: Gilbert Chen <gchen@acrosync.com>
Date: Sun, 11 Oct 2020 15:23:09 -0400
Subject: [PATCH] Change snapshot source path from / to /System/Volumes/Data

Also use a regex to extract the snapshot date from tmutil output.
---
 src/duplicacy_shadowcopy_darwin.go | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/duplicacy_shadowcopy_darwin.go b/src/duplicacy_shadowcopy_darwin.go
index d92be46e..1d8a3b64 100755
--- a/src/duplicacy_shadowcopy_darwin.go
+++ b/src/duplicacy_shadowcopy_darwin.go
@@ -14,7 +14,6 @@ import (
 	"os"
 	"os/exec"
 	"regexp"
-	"strings"
 	"syscall"
 	"time"
 )
@@ -77,19 +76,19 @@ func DeleteShadowCopy() {
 
 	err := exec.Command("/sbin/umount", "-f", snapshotPath).Run()
 	if err != nil {
-		LOG_ERROR("VSS_DELETE", "Error while unmounting snapshot")
+		LOG_WARN("VSS_DELETE", "Error while unmounting snapshot: %v", err)
 		return
 	}
 
 	err = exec.Command("tmutil", "deletelocalsnapshots", snapshotDate).Run()
 	if err != nil {
-		LOG_ERROR("VSS_DELETE", "Error while deleting local snapshot")
+		LOG_WARN("VSS_DELETE", "Error while deleting local snapshot: %v", err)
 		return
 	}
 
 	err = os.RemoveAll(snapshotPath)
 	if err != nil {
-		LOG_ERROR("VSS_DELETE", "Error while deleting temporary mount directory")
+		LOG_WARN("VSS_DELETE", "Error while deleting temporary mount directory: %v", err)
 		return
 	}
 
@@ -150,12 +149,13 @@ func CreateShadowCopy(top string, shadowCopy bool, timeoutInSeconds int) (shadow
 		return top
 	}
 
-	colonPos := strings.IndexByte(tmutilOutput, ':')
-	if colonPos < 0 {
+	snapshotDateRegex := regexp.MustCompile(`:\s+([0-9\-]+)`)
+	matched := snapshotDateRegex.FindStringSubmatch(tmutilOutput)
+	if matched == nil {
 		LOG_ERROR("VSS_CREATE", "Snapshot creation failed: %s", tmutilOutput)
 		return top
 	}
-	snapshotDate = strings.TrimSpace(tmutilOutput[colonPos+1:])
+	snapshotDate = matched[1]
 
 	tmutilOutput, err = CommandWithTimeout(timeoutInSeconds, "tmutil", "listlocalsnapshots", ".")
 	if err != nil {
@@ -164,17 +164,17 @@ func CreateShadowCopy(top string, shadowCopy bool, timeoutInSeconds int) (shadow
 	}
 	snapshotName := "com.apple.TimeMachine." + snapshotDate
  
-	r := regexp.MustCompile(`(?m)^(.+` + snapshotDate + `.*)$`)
-	snapshotNames := r.FindStringSubmatch(tmutilOutput)
-	if len(snapshotNames) > 0 {
-		snapshotName = snapshotNames[0]
+	snapshotNameRegex := regexp.MustCompile(`(?m)^(.+` + snapshotDate + `.*)$`)
+	matched = snapshotNameRegex.FindStringSubmatch(tmutilOutput)
+	if len(matched) > 0 {
+		snapshotName = matched[0]
 	} else {
-		LOG_WARN("VSS_CREATE", "Error while using 'tmutil listlocalsnapshots' to find snapshot name. Will fallback to 'com.apple.TimeMachine.SNAPSHOT_DATE'")
+		LOG_INFO("VSS_CREATE", "Can't find the snapshot name with 'tmutil listlocalsnapshots'; fallback to %s", snapshotName)
 	}
  
 	// Mount snapshot as readonly and hide from GUI i.e. Finder
 	_, err = CommandWithTimeout(timeoutInSeconds,
-		"/sbin/mount", "-t", "apfs", "-o", "nobrowse,-r,-s="+snapshotName, "/", snapshotPath)
+		"/sbin/mount", "-t", "apfs", "-o", "nobrowse,-r,-s="+snapshotName, "/System/Volumes/Data", snapshotPath)
 	if err != nil {
 		LOG_ERROR("VSS_CREATE", "Error while mounting snapshot: %v", err)
 		return top