[X2Go-Commits] [x2goclient] 01/01: sshprocess.cpp: export PATH variable when running commands.

git-admin at x2go.org git-admin at x2go.org
Wed Jun 3 21:25:59 CEST 2015


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 f07d58fcbea61653fe5f32230808e011c69cc65d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jun 3 21:23:28 2015 +0200

    sshprocess.cpp: export PATH variable when running commands.
    
    Otherwise, only the first one will respect the new PATH value.
---
 debian/changelog   |    2 ++
 src/sshprocess.cpp |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2700616..35f60b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ x2goclient (4.0.4.1-0x2go1) UNRELEASED; urgency=low
     - onmainwindow.cpp: split up PATH value as printed in the error message
       box by a newline every 100 characters. Makes it look less ugly and fixes
       truncation issues.
+    - sshprocess.cpp: export PATH variable when running commands. Otherwise,
+      only the first one will respect the new PATH value.
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 26 May 2015 21:42:09 +0200
 
diff --git a/src/sshprocess.cpp b/src/sshprocess.cpp
index 94948bc..9dbba4e 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 + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +";'";
+        QString shcmd = "sh -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)));
@@ -209,7 +209,7 @@ void SshProcess::startNormal(const QString& cmd)
     else
     {
         QString host=masterCon->getHost();
-        QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; PATH=/usr/local/bin:/usr/bin:/bin "+cmd+"; echo X2GODATAEND:" + uuidStr +";'";
+        QString shcmd = "sh -c 'echo X2GODATABEGIN:" + uuidStr + "; export PATH=/usr/local/bin:/usr/bin:/bin; "+cmd+"; echo X2GODATAEND:" + uuidStr +";'";
         proc=new QProcess(this);
 #ifdef Q_OS_WIN
         if(masterCon->get_kerberosDelegation())

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list