diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp index 10df061e708f8ea4e8abc451730ba7a9f29319e4..b562aea94cece1c71966bc37a47b2140b6869ba0 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeviceenvreader.cpp @@ -34,6 +34,7 @@ #include "maemodeviceenvreader.h" +#include "maemoglobal.h" #include "maemorunconfiguration.h" #include <coreplugin/ssh/sshconnection.h> @@ -101,8 +102,7 @@ void MaemoDeviceEnvReader::executeRemoteCall() if (m_stop) return; - const QByteArray remoteCall("test -f /etc/profile && source /etc/profile; " - "test -f ~/.profile && source ~/.profile; env"); + const QByteArray remoteCall = MaemoGlobal::remoteSourceProfilesCommand().toUtf8() + "; env"; m_remoteProcess = m_connection->createRemoteProcess(remoteCall); connect(m_remoteProcess.data(), SIGNAL(closed(int)), this, diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp index 8a1ee88a6c788d7ef318c53106f9144bf8967f4e..c07fd5cd59fe303b0d859a48b81881171652b0b1 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp @@ -48,8 +48,18 @@ QString MaemoGlobal::remoteSudo() QString MaemoGlobal::remoteCommandPrefix(const QString &commandFilePath) { - return QString::fromLocal8Bit("%1 chmod a+x %2 && source /etc/profile; " - "source /home/user/.profile; ").arg(remoteSudo(), commandFilePath); + return QString::fromLocal8Bit("%1 chmod a+x %2; %3; ") + .arg(remoteSudo(), commandFilePath, remoteSourceProfilesCommand()); +} + +QString MaemoGlobal::remoteSourceProfilesCommand() +{ + const QList<QByteArray> profiles = QList<QByteArray>() << "/etc/profile" + << "/home/user/.profile" << "~/.profile"; + QByteArray remoteCall(":"); + foreach (const QByteArray &profile, profiles) + remoteCall += "; test -f " + profile + " && source " + profile; + return QString::fromAscii(remoteCall); } QString MaemoGlobal::remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list) diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h index a43edb6724663097a55df81ae267bf55e233bb75..762b67c4f4ee3449f6c268fb09653ce48b1832fc 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoglobal.h @@ -52,6 +52,7 @@ public: static QString remoteCommandPrefix(const QString &commandFilePath); static QString remoteEnvironment(const QList<ProjectExplorer::EnvironmentItem> &list); static QString remoteProjectSourcesMountPoint(); + static QString remoteSourceProfilesCommand(); template<class T> static T *buildStep(const ProjectExplorer::DeployConfiguration *dc) { diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp index e51bc93ec17144c9c53041943336cb806b41ec31..22a2e58dc9d1f517ce2407937efa4cd5075d3994 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemoremotemounter.cpp @@ -240,7 +240,9 @@ void MaemoRemoteMounter::startUtfsClients() .arg(mountSpec.remoteMountPoint); if (mountInfo.mountAsRoot) utfsClient.prepend(MaemoGlobal::remoteSudo() + QLatin1Char(' ')); - remoteCall += andOp + mkdir + andOp + chmod + andOp + utfsClient; + QLatin1String seqOp("; "); + remoteCall += seqOp + MaemoGlobal::remoteSourceProfilesCommand() + + seqOp + mkdir + andOp + chmod + andOp + utfsClient; } emit reportProgress(tr("Starting remote UTFS clients..."));