From: Jeff Halter <redacted>
Date: Tue, 21 Jun 2022 17:33:14 +0000 (-0700)
Subject: Replace path.Join with filepath.Join
X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/46b48603ea0e69aab8084a3ce32b31995b31b09c?ds=sidebyside

Replace path.Join with filepath.Join
---

diff --git a/hotline/file_wrapper.go b/hotline/file_wrapper.go
index 2ad76f4..997d6d9 100644
--- a/hotline/file_wrapper.go
+++ b/hotline/file_wrapper.go
@@ -7,7 +7,6 @@ import (
 	"io"
 	"io/fs"
 	"os"
-	"path"
 	"path/filepath"
 )
 
@@ -168,22 +167,22 @@ func (f *fileWrapper) dataFile() (os.FileInfo, error) {
 
 // move a fileWrapper and its associated metadata files to newPath
 func (f *fileWrapper) move(newPath string) error {
-	err := f.fs.Rename(f.dataPath, path.Join(newPath, f.name))
+	err := f.fs.Rename(f.dataPath, filepath.Join(newPath, f.name))
 	if err != nil {
 		// TODO
 	}
 
-	err = f.fs.Rename(f.incompletePath, path.Join(newPath, f.incompleteDataName()))
+	err = f.fs.Rename(f.incompletePath, filepath.Join(newPath, f.incompleteDataName()))
 	if err != nil {
 		// TODO
 	}
 
-	err = f.fs.Rename(f.rsrcPath, path.Join(newPath, f.rsrcForkName()))
+	err = f.fs.Rename(f.rsrcPath, filepath.Join(newPath, f.rsrcForkName()))
 	if err != nil {
 		// TODO
 	}
 
-	err = f.fs.Rename(f.infoPath, path.Join(newPath, f.infoForkName()))
+	err = f.fs.Rename(f.infoPath, filepath.Join(newPath, f.infoForkName()))
 	if err != nil {
 		// TODO
 	}