This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx-kerberos in repository x2goclient. commit 3373687212cea25320cb66e978b96ecefea6b388 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jun 3 23:37:42 2015 +0200 sshprocess.cpp: wrap all remote commands with "bash" instead of the unspecific "sh". --- debian/changelog | 2 ++ src/sshprocess.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8f84b33..dee4e58 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low only the first one will respect the new PATH value. - sshprocess.cpp: wrap SSH command prelude and conclusion in double quotes. + - sshprocess.cpp: wrap all remote commands with "bash" instead of the + unspecific "sh". -- X2Go Release Manager <git-admin@x2go.org> Tue, 26 May 2015 21:42:09 +0200 diff --git a/src/sshprocess.cpp b/src/sshprocess.cpp index cc5a891..8e8c4e5 100644 --- a/src/sshprocess.cpp +++ b/src/sshprocess.cpp @@ -200,7 +200,7 @@ void SshProcess::startNormal(const QString& cmd) // #endif if(!masterCon->useKerberos()) { - QString shcmd = "sh -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/bin\"; "+cmd+"; echo \"X2GODATAEND:" + uuidStr +"\";'"; + QString shcmd = "bash -c 'echo \"X2GODATABEGIN:" + uuidStr + "\"; export PATH=\"/usr/local/bin:/usr/bin:/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))); @@ -210,7 +210,7 @@ void SshProcess::startNormal(const QString& cmd) { QString host=masterCon->getHost(); - QString shcmd = "sh -c 'echo \\\"X2GODATABEGIN:" + uuidStr + "\\\"; export PATH=\\\"/usr/local/bin:/usr/bin:/bin\\\"; "+cmd+"; echo \\\"X2GODATAEND:" + uuidStr +"\\\";'"; + QString shcmd = "bash -c 'echo \\\"X2GODATABEGIN:" + uuidStr + "\\\"; export PATH=\\\"/usr/local/bin:/usr/bin:/bin\\\"; "+cmd+"; echo \\\"X2GODATAEND:" + uuidStr +"\\\";'"; proc=new QProcess(this); #ifdef Q_OS_WIN -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git