Skip to content

runtime: 删除已废弃的 bash 桥死代码 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ybz21 merged 1 commit into from
Jun 23, 2026
+8 −35
Merged

runtime: 删除已废弃的 bash 桥死代码 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 8 additions & 35 deletions cli/ttmux-cli-go/internal/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,21 @@ type Runtime struct {
MetaDir string
EnvFile string
TmuxBin string
ShellPath string
Repository string
Now func() time.Time
}

func New() Runtime {
home, _ := os.UserHomeDir()
dataDir := envOr("TTMUX_DATA", filepath.Join(home, ".local", "share", "ttmux"))
root := discoverRepo()
return Runtime{
HomeDir: envOr("TTMUX_HOME", filepath.Join(home, ".ttmux")),
DataDir: dataDir,
LogsDir: filepath.Join(dataDir, "logs"),
GroupsDir: filepath.Join(dataDir, "groups"),
MetaDir: filepath.Join(dataDir, "meta"),
EnvFile: filepath.Join(dataDir, "env"),
TmuxBin: envOrLookup("TMUX_BIN", "tmux"),
ShellPath: envOr("TTMUX_SHELL", filepath.Join(root, "ttmux")),
Repository: root,
Now: time.Now,
HomeDir: envOr("TTMUX_HOME", filepath.Join(home, ".ttmux")),
DataDir: dataDir,
LogsDir: filepath.Join(dataDir, "logs"),
GroupsDir: filepath.Join(dataDir, "groups"),
MetaDir: filepath.Join(dataDir, "meta"),
EnvFile: filepath.Join(dataDir, "env"),
TmuxBin: envOrLookup("TMUX_BIN", "tmux"),
Now: time.Now,
}
}

Expand All @@ -53,15 +48,6 @@ func (r Runtime) EnsureDirs() error {
return nil
}

func (r Runtime) Shell(args ...string) error {
cmd := exec.Command(r.ShellPath, args...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
cmd.Env = os.Environ()
return cmd.Run()
}

func (r Runtime) Tmux(args ...string) error {
cmd := exec.Command(r.TmuxBin, args...)
cmd.Stdin = os.Stdin
Expand Down Expand Up @@ -288,16 +274,3 @@ func envOrLookup(key, fallback string) string {
}
return fallback
}

func discoverRepo() string {
wd, err := os.Getwd()
if err != nil {
return "."
}
for dir := wd; dir != filepath.Dir(dir); dir = filepath.Dir(dir) {
if _, err := os.Stat(filepath.Join(dir, "ttmux")); err == nil {
return dir
}
}
return wd
}
Loading