Skip to content

Commit 725df38

Browse files
authored
Merge pull request #26 from github/vdye/init-bugfix
File creation bugfix for `init` + misc cleanup
2 parents 50133e5 + 9727ad6 commit 725df38

File tree

4 files changed

+11
-17
lines changed

4 files changed

+11
-17
lines changed

Wishlist.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

doc.go

Lines changed: 0 additions & 1 deletion
This file was deleted.

internal/common/filesystem.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,16 @@ func (f *fileSystem) DeleteFile(filename string) (bool, error) {
6363
}
6464

6565
func (f *fileSystem) ReadFileLines(filename string) ([]string, error) {
66-
file, err := os.OpenFile(filename, os.O_RDONLY|os.O_CREATE, 0o600)
66+
file, err := os.Open(filename)
6767
if err != nil {
68-
return nil, err
68+
pathErr, ok := err.(*os.PathError)
69+
if ok && pathErr.Err == syscall.ENOENT {
70+
// If the file doesn't exist, return empty result rather than an
71+
// error
72+
return []string{}, nil
73+
} else {
74+
return nil, err
75+
}
6976
}
7077

7178
var l []string

internal/core/repo.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func CreateRepository(route string) (*Repository, error) {
2323
fs := common.NewFileSystem()
2424
repos, err := GetRepositories(user, fs)
2525
if err != nil {
26-
return nil, fmt.Errorf("failed to parse routes file")
26+
return nil, fmt.Errorf("failed to parse routes file: %w", err)
2727
}
2828

2929
repo, contains := repos[route]
@@ -63,7 +63,7 @@ func RemoveRoute(route string) error {
6363
fs := common.NewFileSystem()
6464
repos, err := GetRepositories(user, fs)
6565
if err != nil {
66-
return fmt.Errorf("failed to parse routes file")
66+
return fmt.Errorf("failed to parse routes file: %w", err)
6767
}
6868

6969
_, contains := repos[route]

0 commit comments

Comments
 (0)