snapshot

twpayne · Apr 22, 2020 · fbf29c9 · fbf29c9
1 parent a930f5f
commit fbf29c9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/v2/chezmoi/debugsystem.go b/v2/chezmoi/debugsystem.go
@@ -144,7 +144,6 @@ func (s *DebugSystem) Set(bucket, key, value []byte) error {
 	return Debugf("Set(%q, %q, %q)", []interface{}{string(bucket), string(key), string(value)}, func() error {
 		return s.s.Set(bucket, key, value)
 	})
-
 }
 
 // Stat implements System.Stat.

diff --git a/v2/chezmoi/realsystem_posix.go b/v2/chezmoi/realsystem_posix.go
@@ -13,14 +13,14 @@ import (
 )
 
 // WriteFile implements System.WriteFile.
-func (fs *RealSystem) WriteFile(filename string, data []byte, perm os.FileMode) error {
+func (s *RealSystem) WriteFile(filename string, data []byte, perm os.FileMode) error {
 	// Special case: if writing to the real filesystem on a non-Windows system,
 	// use github.com/google/renameio.
-	if fs.FS == vfs.OSFS {
+	if s.FS == vfs.OSFS {
 		dir := path.Dir(filename)
-		dev, ok := fs.devCache[dir]
+		dev, ok := s.devCache[dir]
 		if !ok {
-			info, err := fs.Stat(dir)
+			info, err := s.Stat(dir)
 			if err != nil {
 				return err
 			}
@@ -29,12 +29,12 @@ func (fs *RealSystem) WriteFile(filename string, data []byte, perm os.FileMode)
 				return errors.New("os.FileInfo.Sys() cannot be converted to a *syscall.Stat_t")
 			}
 			dev = uint(statT.Dev)
-			fs.devCache[dir] = dev
+			s.devCache[dir] = dev
 		}
-		tempDir, ok := fs.tempDirCache[dev]
+		tempDir, ok := s.tempDirCache[dev]
 		if !ok {
 			tempDir = renameio.TempDir(dir)
-			fs.tempDirCache[dev] = tempDir
+			s.tempDirCache[dev] = tempDir
 		}
 		t, err := renameio.TempFile(tempDir, filename)
 		if err != nil {
@@ -52,5 +52,5 @@ func (fs *RealSystem) WriteFile(filename string, data []byte, perm os.FileMode)
 		return t.CloseAtomicallyReplace()
 	}
 
-	return WriteFile(fs.FS, filename, data, perm)
+	return WriteFile(s.FS, filename, data, perm)
 }
diff --git a/v2/chezmoi/realsystem_windows.go b/v2/chezmoi/realsystem_windows.go
@@ -3,6 +3,6 @@ package chezmoi
 import "os"
 
 // WriteFile implements System.WriteFile.
-func (fs *RealSystem) WriteFile(filename string, data []byte, perm os.FileMode) error {
-	return WriteFile(fs.FS, filename, data, perm)
+func (s *RealSystem) WriteFile(filename string, data []byte, perm os.FileMode) error {
+	return WriteFile(s.FS, filename, data, perm)
 }