diff options
Diffstat (limited to 'commands/cd.go')
| -rw-r--r-- | commands/cd.go | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/commands/cd.go b/commands/cd.go index 8c0191c2..c1bb7fe2 100644 --- a/commands/cd.go +++ b/commands/cd.go @@ -11,7 +11,9 @@ import ( var previousDir string -type ChangeDirectory struct{} +type ChangeDirectory struct { + Target string `opt:"DIRECTORY" default:"~"` +} func init() { register(ChangeDirectory{}) @@ -36,25 +38,19 @@ func (ChangeDirectory) Complete(aerc *widgets.Aerc, args []string) []string { return dirs } -func (ChangeDirectory) Execute(aerc *widgets.Aerc, args []string) error { - if len(args) < 1 { - return errors.New("Usage: cd [directory]") - } +func (cd ChangeDirectory) Execute(aerc *widgets.Aerc, args []string) error { cwd, err := os.Getwd() if err != nil { return err } - target := strings.Join(args[1:], " ") - if target == "" { - target = "~" - } else if target == "-" { + if cd.Target == "-" { if previousDir == "" { return errors.New("No previous folder to return to") } else { - target = previousDir + cd.Target = previousDir } } - target = xdg.ExpandHome(target) + target := xdg.ExpandHome(cd.Target) if err := os.Chdir(target); err == nil { previousDir = cwd aerc.UpdateStatus() |