| -rw-r--r-- | noncore/apps/opie-console/MyPty.cpp | 17 | ||||
| -rw-r--r-- | noncore/apps/opie-console/consoleconfigwidget.cpp | 11 | ||||
| -rw-r--r-- | noncore/apps/opie-console/profileeditordialog.cpp | 2 |
3 files changed, 25 insertions, 5 deletions
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp index b0f0275..c3c58be 100644 --- a/noncore/apps/opie-console/MyPty.cpp +++ b/noncore/apps/opie-console/MyPty.cpp @@ -293,3 +293,18 @@ void MyPty::reload( const Profile& prof) { m_env.clear(); - m_cmd = prof.readEntry("Command", "/bin/bash"); + m_cmd = prof.readEntry("Command", "/bin/sh"); + + /* + * Lets check if m_cmd actually + * 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 + m_cmd = "/bin/sh"; + int envcount = prof.readNumEntry("EnvVars", 0); diff --git a/noncore/apps/opie-console/consoleconfigwidget.cpp b/noncore/apps/opie-console/consoleconfigwidget.cpp index 70e2e78..3f2d154 100644 --- a/noncore/apps/opie-console/consoleconfigwidget.cpp +++ b/noncore/apps/opie-console/consoleconfigwidget.cpp @@ -26,3 +26,3 @@ ConsoleConfigWidget::ConsoleConfigWidget( const QString& name, QWidget* parent, m_lay->addWidget(m_env); - + QHBox *hbox = new QHBox(this); @@ -36,3 +36,3 @@ ConsoleConfigWidget::ConsoleConfigWidget( const QString& name, QWidget* parent, m_lay->addWidget(hbox); - + hbox = new QHBox(this); @@ -66,4 +66,9 @@ ConsoleConfigWidget::~ConsoleConfigWidget() { void ConsoleConfigWidget::load( const Profile& prof ) { + /* + * we will use /bin/bash as default + * but will fallback in MyPty to /bin/sh + * if necessary + */ m_cmd->setText(prof.readEntry("Command", "/bin/bash")); - int envcount = prof.readNumEntry("EnvVars", 0); + int envcount = prof.readNumEntry("EnvVars", 0); for (int i=0; i<envcount; i++) { diff --git a/noncore/apps/opie-console/profileeditordialog.cpp b/noncore/apps/opie-console/profileeditordialog.cpp index fd04b6b..6b607df 100644 --- a/noncore/apps/opie-console/profileeditordialog.cpp +++ b/noncore/apps/opie-console/profileeditordialog.cpp @@ -202,3 +202,3 @@ void ProfileEditorDialog::slotConActivated( const QString& str ) { //if ( ( )->layer()->supports()[0] == 1 ) { - if ( m_conCmb ->currentText() == tr("local Console") ) { + if ( m_conCmb ->currentText() == tr("Local Console") ) { m_autoConnect->setChecked( true ); |