diff options
Diffstat (limited to 'net/x2goclient/files/patch-sshprocess.cpp')
| -rw-r--r-- | net/x2goclient/files/patch-sshprocess.cpp | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/net/x2goclient/files/patch-sshprocess.cpp b/net/x2goclient/files/patch-sshprocess.cpp index 63a1889da75d..9f7244797660 100644 --- a/net/x2goclient/files/patch-sshprocess.cpp +++ b/net/x2goclient/files/patch-sshprocess.cpp @@ -1,4 +1,4 @@ ---- src/sshprocess.cpp.orig 2015-05-26 19:13:12 UTC +--- src/sshprocess.cpp.orig 2015-07-28 02:50:36 UTC +++ src/sshprocess.cpp @@ -24,6 +24,9 @@ @@ -10,3 +10,21 @@ #include <arpa/inet.h> #include <netinet/tcp.h> #endif +@@ -200,7 +203,7 @@ void SshProcess::startNormal(const QStri + // #endif + if(!masterCon->useKerberos()) + { +- QString shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; ++ QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; + x2goDebug << "Running masterCon->addChannelConnection(this, '" << uuidStr << "', '" << shcmd.left (200) << "');"; + masterCon->addChannelConnection(this, uuidStr, shcmd); + connect(masterCon,SIGNAL(stdOut(SshProcess*,QByteArray)),this,SLOT(slotStdOut(SshProcess*,QByteArray))); +@@ -222,7 +225,7 @@ void SshProcess::startNormal(const QStri + * as there is no preceding "outer double quote" the whole argument + * is wrapped in. + */ +- shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; ++ shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/bin:/bin:/usr/local/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr + "\";'"; + + proc=new QProcess(this); + QString local_cmd = ""; |