| author | zecke <zecke> | 2002-10-31 18:42:29 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2002-10-31 18:42:29 (UTC) |
| commit | 3c76157137de747176466df8c7ecb85105ab9d53 (patch) (side-by-side diff) | |
| tree | 3c93ed589d8b9fb05dfa139ef21c77649daa7bd1 | |
| parent | 1793c4b5f743c31be9db1fbb0b3fbbe08df7df28 (diff) | |
| download | opie-3c76157137de747176466df8c7ecb85105ab9d53.zip opie-3c76157137de747176466df8c7ecb85105ab9d53.tar.gz opie-3c76157137de747176466df8c7ecb85105ab9d53.tar.bz2 | |
The if file exists check was wrong..
I limit it to a /bin/bash check...
| -rw-r--r-- | noncore/apps/opie-console/MyPty.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp index c3c58be..23d4966 100644 --- a/noncore/apps/opie-console/MyPty.cpp +++ b/noncore/apps/opie-console/MyPty.cpp @@ -298,17 +298,15 @@ void MyPty::reload( const Profile& prof) { * exists.... * we try to use bin/bash and if * this fails we * will fallback to /bin/sh * which should be there 100% */ - if ( !QFile::exists(QFile::encodeName(m_cmd) ) ) - if (QFile::exists("/bin/bash") ) - m_cmd = "/bin/bash"; - else + if ( m_cmd.stripWhiteSpace() == "/bin/bash" && !QFile::exists(QFile::encodeName(m_cmd) ) ) m_cmd = "/bin/sh"; + int envcount = prof.readNumEntry("EnvVars", 0); for (int i=0; i<envcount; i++) { QString name = prof.readEntry("Env_Name_" + QString::number(i), ""); QString value = prof.readEntry("Env_Value_" + QString::number(i), ""); if (!(name.isEmpty() || value.isEmpty())) { |