Skip to content

Commit bebdceb

Browse files
committed
Fix typos and receiver names
1 parent 8b35f3d commit bebdceb

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

internal/chezmoi/actualstateentry.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,42 +79,42 @@ func NewActualStateEntry(system System, absPath AbsPath, info os.FileInfo, err e
7979
}
8080
}
8181

82-
// EntryState returns d's entry state.
82+
// EntryState returns s's entry state.
8383
func (s *ActualStateAbsent) EntryState() (*EntryState, error) {
8484
return &EntryState{
8585
Type: EntryStateTypeRemove,
8686
}, nil
8787
}
8888

89-
// Path returns d's path.
89+
// Path returns s's path.
9090
func (s *ActualStateAbsent) Path() AbsPath {
9191
return s.absPath
9292
}
9393

94-
// Remove removes d.
94+
// Remove removes s.
9595
func (s *ActualStateAbsent) Remove(system System) error {
9696
return nil
9797
}
9898

99-
// EntryState returns d's entry state.
99+
// EntryState returns s's entry state.
100100
func (s *ActualStateDir) EntryState() (*EntryState, error) {
101101
return &EntryState{
102102
Type: EntryStateTypeDir,
103103
Mode: os.ModeDir | s.perm,
104104
}, nil
105105
}
106106

107-
// Path returns d's path.
107+
// Path returns s's path.
108108
func (s *ActualStateDir) Path() AbsPath {
109109
return s.absPath
110110
}
111111

112-
// Remove removes d.
112+
// Remove removes s.
113113
func (s *ActualStateDir) Remove(system System) error {
114114
return system.RemoveAll(s.absPath)
115115
}
116116

117-
// EntryState returns d's entry state.
117+
// EntryState returns s's entry state.
118118
func (s *ActualStateFile) EntryState() (*EntryState, error) {
119119
contents, err := s.Contents()
120120
if err != nil {
@@ -132,17 +132,17 @@ func (s *ActualStateFile) EntryState() (*EntryState, error) {
132132
}, nil
133133
}
134134

135-
// Path returns d's path.
135+
// Path returns s's path.
136136
func (s *ActualStateFile) Path() AbsPath {
137137
return s.absPath
138138
}
139139

140-
// Remove removes d.
140+
// Remove removes s.
141141
func (s *ActualStateFile) Remove(system System) error {
142142
return system.RemoveAll(s.absPath)
143143
}
144144

145-
// EntryState returns d's entry state.
145+
// EntryState returns s's entry state.
146146
func (s *ActualStateSymlink) EntryState() (*EntryState, error) {
147147
linkname, err := s.Linkname()
148148
if err != nil {
@@ -159,12 +159,12 @@ func (s *ActualStateSymlink) EntryState() (*EntryState, error) {
159159
}, nil
160160
}
161161

162-
// Path returns d's path.
162+
// Path returns s's path.
163163
func (s *ActualStateSymlink) Path() AbsPath {
164164
return s.absPath
165165
}
166166

167-
// Remove removes d.
167+
// Remove removes s.
168168
func (s *ActualStateSymlink) Remove(system System) error {
169169
return system.RemoveAll(s.absPath)
170170
}

main_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ func cmdMkFile(ts *testscript.TestScript, neg bool, args []string) {
192192
// cmdMkAGEConfig creates a AGE key and a chezmoi configuration file.
193193
func cmdMkAGEConfig(ts *testscript.TestScript, neg bool, args []string) {
194194
if neg {
195-
ts.Fatalf("unupported: ! mkageconfig")
195+
ts.Fatalf("unsupported: ! mkageconfig")
196196
}
197197
if len(args) > 0 {
198198
ts.Fatalf("usage: mkageconfig")
@@ -239,7 +239,7 @@ func cmdMkGitConfig(ts *testscript.TestScript, neg bool, args []string) {
239239
// cmdMkGPGConfig creates a GPG key and a chezmoi configuration file.
240240
func cmdMkGPGConfig(ts *testscript.TestScript, neg bool, args []string) {
241241
if neg {
242-
ts.Fatalf("unupported: ! mkgpgconfig")
242+
ts.Fatalf("unsupported: ! mkgpgconfig")
243243
}
244244
if len(args) > 1 || len(args) == 1 && args[0] != "-symmetric" {
245245
ts.Fatalf("usage: mkgpgconfig [-symmetric]")

0 commit comments

Comments
 (0)