interesting
/
aminal
mirror of https://github.com/liamg/aminal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into redraw_fix

This commit is contained in:
Vladimir Kravets 2018-12-02 20:08:30 +02:00 committed by GitHub
parent b4c4cb7b08 21d3c99331
commit a560d6eae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
main.go
View File

@ -31,13 +31,13 @@ func main() {
logger.Fatalf("Failed to allocate pty: %s", err) logger.Fatalf("Failed to allocate pty: %s", err)
} }
shellStr, err := loginshell.Shell() shellStr := conf.Shell
if err != nil { if shellStr == "" {
logger.Fatalf("Failed to ascertain your shell: %s", err) loginShell, err := loginshell.Shell()
} if err != nil {
logger.Fatalf("Failed to ascertain your shell: %s", err)
if conf.Shell != "" { }
shellStr = conf.Shell shellStr = loginShell
} }
os.Setenv("TERM", "xterm-256color") // controversial! easier than installing terminfo everywhere, but obviously going to be slightly different to xterm functionality, so we'll see... os.Setenv("TERM", "xterm-256color") // controversial! easier than installing terminfo everywhere, but obviously going to be slightly different to xterm functionality, so we'll see...