sammyette
/
Hilbish
mirror of https://github.com/Hilbis/Hilbish
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: make expand home actually expand and not do the opposite

pull/145/head
TorchedSammy 2022-04-19 22:05:48 -04:00
parent 7a17d7931f
commit 0ae31123b9
Signed by: sammyette
GPG Key ID: 904FC49417B44DCD
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.go
View File

@ -239,9 +239,11 @@ func continuePrompt(prev string) (string, error) {
func fmtPrompt(prompt string) string { func fmtPrompt(prompt string) string {
host, _ := os.Hostname() host, _ := os.Hostname()
cwd, _ := os.Getwd() cwd, _ := os.Getwd()
cwd = expandHome(cwd)
username := curuser.Username
if strings.HasPrefix(cwd, curuser.HomeDir) {
cwd = "~" + strings.TrimPrefix(cwd, curuser.HomeDir)
}
username := curuser.Username
// this will be baked into binary since GOOS is a constant // this will be baked into binary since GOOS is a constant
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
username = strings.Split(username, "\\")[1] // for some reason Username includes the hostname on windows username = strings.Split(username, "\\")[1] // for some reason Username includes the hostname on windows
@ -272,12 +274,8 @@ func handleHistory(cmd string) {
} }
func expandHome(path string) string { func expandHome(path string) string {
expanded := path homedir := curuser.HomeDir
if strings.HasPrefix(path, curuser.HomeDir) { return strings.Replace(path, "~", homedir, 1)
expanded = "~" + strings.TrimPrefix(path, curuser.HomeDir)
}
return expanded
} }
func removeDupes(slice []string) []string { func removeDupes(slice []string) []string {