From 209a122c46db0b58478a6e7317052d9fe6516d7a Mon Sep 17 00:00:00 2001 From: Filippo Scognamiglio Date: Wed, 30 Jul 2014 18:14:42 +0200 Subject: [PATCH] Shell path is not hardcoded anymore but retrieved by /bin/bash --- konsole-qml-plugin/src/ksession.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/konsole-qml-plugin/src/ksession.cpp b/konsole-qml-plugin/src/ksession.cpp index 62338f4..34e239a 100644 --- a/konsole-qml-plugin/src/ksession.cpp +++ b/konsole-qml-plugin/src/ksession.cpp @@ -67,9 +67,14 @@ Session *KSession::createSession(QString name) * By setting it to $SHELL right away we actually make the first filecheck obsolete. * But as iam not sure if you want to do anything else ill just let both checks in and set this to $SHELL anyway. */ - session->setProgram("/bin/bash"); - //session->setProgram(getenv("SHELL")); + //cool-old-term: There is another check in the code. Not sure if useful. + + QString envshell = getenv("SHELL"); + QString shellProg = envshell != NULL ? envshell : "/bin/bash"; + session->setProgram(shellProg); + + //session->setProgram(); QStringList args(""); session->setArguments(args);