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

Merge pull request #101 from vkravets/shell_config 

Using shell from config if specified
This commit is contained in:
Liam Galvin 2018-12-02 17:46:01 +00:00 committed by GitHub
parent 58dd4bf3a1 9ebee461e4
commit 21d3c99331
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)
}
shellStr, err := loginshell.Shell()
if err != nil {
logger.Fatalf("Failed to ascertain your shell: %s", err)
}
if conf.Shell != "" {
shellStr = conf.Shell
shellStr := conf.Shell
if shellStr == "" {
loginShell, err := loginshell.Shell()
if err != nil {
logger.Fatalf("Failed to ascertain your shell: %s", err)
}
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...