Commit af86ba8d authored by Christian Kandeler's avatar Christian Kandeler
Browse files

RemoteLinux: Don't do a chmod on the executable before running.

It does not seem to be necessary anymore, Harmattan does not support it,
and it was a hack in the first place.

Change-Id: I393fda9dbc45a9da5d270df3cfd0b90dbbfbdf2e
Reviewed-on: http://codereview.qt.nokia.com/386

Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent 3485d7f5
......@@ -170,11 +170,9 @@ QString MaemoGlobal::remoteSudo(const QString &osType, const QString &uname)
return QString(); // Using sudo would open a can of worms.
}
QString MaemoGlobal::remoteCommandPrefix(const QString &osType, const QString &userName,
const QString &commandFilePath)
QString MaemoGlobal::remoteCommandPrefix(const QString &osType)
{
QString prefix = QString::fromLocal8Bit("%1 chmod a+x %2; %3; ")
.arg(remoteSudo(osType, userName), commandFilePath, remoteSourceProfilesCommand());
QString prefix = QString::fromLocal8Bit("%1; ").arg(remoteSourceProfilesCommand());
if (osType != LinuxDeviceConfiguration::Maemo5OsType
&& osType != LinuxDeviceConfiguration::HarmattanOsType) {
prefix += QLatin1String("DISPLAY=:0.0 ");
......
......@@ -108,8 +108,7 @@ public:
static QString devrootshPath();
static int applicationIconSize(const QString &osType);
static QString remoteSudo(const QString &osType, const QString &uname);
static QString remoteCommandPrefix(const QString &osType,
const QString &userName, const QString &commandFilePath);
static QString remoteCommandPrefix(const QString &osType);
static QString remoteEnvironment(const QList<Utils::EnvironmentItem> &list);
static QString remoteSourceProfilesCommand();
static QString failedToConnectToServerMessage(const QSharedPointer<Utils::SshConnection> &connection,
......
......@@ -310,8 +310,7 @@ QString RemoteLinuxRunConfiguration::commandPrefix() const
return QString();
return QString::fromLocal8Bit("%1 %2")
.arg(MaemoGlobal::remoteCommandPrefix(deviceConfig()->osType(),
deviceConfig()->sshParameters().userName, remoteExecutableFilePath()))
.arg(MaemoGlobal::remoteCommandPrefix(deviceConfig()->osType()))
.arg(MaemoGlobal::remoteEnvironment(userEnvironmentChanges()));
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment