This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 8bc1b2b6e5f80d6729f282ff9984ca1fcf160252 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Nov 14 01:33:22 2017 +0100 {example/x2goclient-cli,src/onmainwindow.cpp}: remove hopefully obsolete HOSTNAME exporting into environment. --- debian/changelog | 2 ++ examples/x2goclient-cli | 4 ++-- src/onmainwindow.cpp | 12 ++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index ded9f24..5cdc048 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,6 +35,8 @@ x2goclient (4.1.1.1-0x2go1) UNRELEASED; urgency=medium - src/onmainwindow.cpp: wrap user name for client-side mounts in quotes. Fixes: #559. Will fail with user names that contain quotes, but oh well... + - {example/x2goclient-cli,src/onmainwindow.cpp}: remove hopefully obsolete + HOSTNAME exporting into environment. [ Oleksandr Shneyder ] * New upstream version (4.1.1.1): diff --git a/examples/x2goclient-cli b/examples/x2goclient-cli index ddf9068..927eb66 100755 --- a/examples/x2goclient-cli +++ b/examples/x2goclient-cli @@ -389,13 +389,13 @@ if(!$ssh_key) { $pass=read_password('Password:'); printpass $askpass,$pass; - $sessions=`DISPLAY=:0 SSH_ASKPASS=$askpass setsid ssh -p $port $user\@$server "export HOSTNAME&&x2golistsessions"`; + $sessions=`DISPLAY=:0 SSH_ASKPASS=$askpass setsid ssh -p $port $user\@$server "x2golistsessions"`; hidepass $askpass; checkstat $askpass; } else { - $sessions=`ssh -p $port -i $ssh_key $user\@$server "export HOSTNAME&&x2golistsessions"`; + $sessions=`ssh -p $port -i $ssh_key $user\@$server "x2golistsessions"`; } my @sess=split("\n","$sessions"); diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index f1748fd..0628411 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -3090,7 +3090,7 @@ void ONMainWindow::slotServSshConnectionOk(QString server) if (!con) return; x2goDebug<<"Getting sessions on host: " + server; - con->executeCommand( "export HOSTNAME && x2golistsessions", this, SLOT (slotListAllSessions ( bool,QString,int ) )); + con->executeCommand( "x2golistsessions", this, SLOT (slotListAllSessions ( bool,QString,int ) )); } void ONMainWindow::slotSshInteractionFinish(SshMasterConnection* connection) @@ -3464,9 +3464,9 @@ void ONMainWindow::continueNormalSession() return; } if ( !shadowSession ) - sshConnection->executeCommand ( "export HOSTNAME && x2golistsessions", this,SLOT ( slotListSessions ( bool, QString,int ))); + sshConnection->executeCommand ( "x2golistsessions", this,SLOT ( slotListSessions ( bool, QString,int ))); else - sshConnection->executeCommand ( "export HOSTNAME && x2golistdesktops", this,SLOT ( slotListSessions ( bool, QString,int ))); + sshConnection->executeCommand ( "x2golistdesktops", this,SLOT ( slotListSessions ( bool, QString,int ))); } @@ -8793,7 +8793,7 @@ void ONMainWindow::slotExportTimer() for ( int i=0; i<args.size(); ++i ) { - sshConnection->executeCommand ( "export HOSTNAME && x2goumount_session "+ + sshConnection->executeCommand ( "x2goumount_session "+ sessionId+" "+args[i] ); } } @@ -9995,10 +9995,10 @@ void ONMainWindow::startX2goMount() dirs=dirs+"__REVERSESSH_PORT__"+resumingSession.fsPort; } if ( !rem ) - cmd = "export HOSTNAME && x2gomountdirs dir " + sessionId + " \"" + cuser + + cmd = "x2gomountdirs dir " + sessionId + " \"" + cuser + "\" " + dir->dstKey + " " + dirs; else - cmd = "export HOSTNAME && x2gomountdirs rem " + sessionId + " \"" + cuser + + cmd = "x2gomountdirs rem " + sessionId + " \"" + cuser + "\" " + dir->dstKey + " " + dirs; #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