Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions dotool/infect.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"log"
"os"
"path/filepath"
"strings"
"time"
)

Expand Down Expand Up @@ -51,6 +52,9 @@ func linkDirectory(sourceDir, homeDir string, addDot bool) error {
}

for _, entry := range entries {
if skipSource(entry.Name()) {
continue
}
sourcePath := filepath.Join(sourceDir, entry.Name())
name := entry.Name()
if addDot {
Expand Down Expand Up @@ -79,6 +83,9 @@ func linkSpecificFiles(homeDir string) error {
if err != nil {
return fmt.Errorf("failed to get relative path for %s: %w", path, err)
}
if skipSource(relativePath) {
return nil
}

targetPath := filepath.Join(homeDir, "."+relativePath)
if err := os.MkdirAll(filepath.Dir(targetPath), 0750); err != nil {
Expand All @@ -89,6 +96,12 @@ func linkSpecificFiles(homeDir string) error {
})
}

// skipSource reports whether rel, a path under link/ or specific/, must not be linked.
// A dot-prefixed top-level name would land at ~/..name, and .DS_Store is Finder litter.
func skipSource(rel string) bool {
return strings.HasPrefix(rel, ".") || filepath.Base(rel) == ".DS_Store"
}

func linkBinFiles(homeDir string) error {
entries, err := os.ReadDir("bin")
if err != nil {
Expand Down
36 changes: 36 additions & 0 deletions dotool/infect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,39 @@ func TestLinkBinFiles(t *testing.T) {
}
}
}

func TestLinkSkipsDotEntries(t *testing.T) {
tempDir := t.TempDir()
t.Chdir(tempDir)

for _, file := range []string{"link/.DS_Store", "link/.zsh_favlist", "link/zshrc", "specific/.DS_Store", "specific/config/app/.DS_Store", "specific/config/app/.envrc"} {
if err := os.MkdirAll(filepath.Dir(file), 0750); err != nil {
t.Fatalf("failed to create directory for %s: %v", file, err)
}
if err := os.WriteFile(file, []byte("x"), 0600); err != nil {
t.Fatalf("failed to create test file %s: %v", file, err)
}
}

homeDir := filepath.Join(tempDir, "home")
if err := os.MkdirAll(homeDir, 0750); err != nil {
t.Fatalf("failed to create home directory: %v", err)
}
if err := linkDirectory("link", homeDir, true); err != nil {
t.Fatalf("linkDirectory() error = %v", err)
}
if err := linkSpecificFiles(homeDir); err != nil {
t.Fatalf("linkSpecificFiles() error = %v", err)
}

for _, want := range []string{".zshrc", ".config/app/.envrc"} {
if _, err := os.Lstat(filepath.Join(homeDir, want)); err != nil {
t.Errorf("expected symlink %s: %v", want, err)
}
}
for _, unwanted := range []string{"..DS_Store", "..zsh_favlist", ".config/app/.DS_Store"} {
if _, err := os.Lstat(filepath.Join(homeDir, unwanted)); err == nil {
t.Errorf("unexpected symlink %s", unwanted)
}
}
}
Loading