celediel/gt
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

replace workdir with . in tables

Browse source
This commit is contained in:
Lilian Jónsdóttir 2024-06-19 22:21:35 -07:00
parent f7605f6eab
commit 966643fd2e
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
internal/dirs/dirs.go
View file

@ -9,7 +9,9 @@ import (
// UnExpand unexpands some directory shortcuts
//
// $HOME -> ~
func UnExpand(dir string) (outdir string) {
// $PWD -> .
// workdir -> .
func UnExpand(dir, workdir string) (outdir string) {
var (
home = os.Getenv("HOME")
pwd string
@ -18,9 +20,13 @@ func UnExpand(dir string) (outdir string) {
outdir = filepath.Clean(dir)
if workdir != "" {
outdir = strings.Replace(outdir, workdir, ".", 1)
}
pwd, err = os.Getwd()
if err == nil && home != pwd {
outdir = strings.Replace(outdir, pwd, "$PWD", 1)
outdir = strings.Replace(outdir, pwd, ".", 1)
}
outdir = strings.Replace(outdir, home, "~", 1)