This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 0038d25fb41062270a54a174d24598b064ac1d90 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Apr 19 06:36:33 2015 +0200 onmainwindow.cpp: quote commands for generating pulse-client.conf correctly, add more quotes and use absolute file path for pulse cookie. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index cedb7ab..14a7787 100644 --- a/debian/changelog +++ b/debian/changelog @@ -255,6 +255,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low remote xinerama config file. Post-fixup for #797. - {onmainwindow.cpp,README.i18n}: fix localization -- resource strings were not correctly updated. Fixes: #828. + - onmainwindow.cpp: quote commands for generating pulse-client.conf + correctly, add more quotes and use absolute file path for pulse cookie. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 8f32562..a4f4f42 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -4975,28 +4975,28 @@ void ONMainWindow::slotRetResumeSess ( bool result, startSoundServer=false; QString scmd; if ( !sshSndTunnel ) - scmd="echo \"default-server=`echo " - "$SSH_CLIENT | awk '{print $1}'`:"+ + scmd="echo \\\"default-server=$(echo " + "$SSH_CLIENT | awk '{print $1}'):"+ sndPort+ - "\"> $HOME/.x2go/C-"+ + "\\\" > $HOME/.x2go/C-"+ resumingSession.sessionId+ "/.pulse-client.conf" - ";echo \"cookie-file=.x2go/C-"+ + ";echo \\\"cookie-file=${HOME}.x2go/C-"+ resumingSession.sessionId+ "/.pulse-cookie"+ - "\">> $HOME/.x2go/C-"+ + "\\\" >> ${HOME}/.x2go/C-"+ resumingSession.sessionId+ "/.pulse-client.conf"; else - scmd="echo \"default-server=localhost:"+ + scmd="echo \\\"default-server=localhost:"+ resumingSession.sndPort+ - "\"> $HOME/.x2go/C-"+ + "\\\" > $HOME/.x2go/C-"+ resumingSession.sessionId+ "/.pulse-client.conf" - ";echo \"cookie-file=.x2go/C-"+ + ";echo \\\"cookie-file=${HOME}.x2go/C-"+ resumingSession.sessionId+ "/.pulse-cookie"+ - "\">> $HOME/.x2go/C-"+ + "\\\" >> ${HOME}/.x2go/C-"+ resumingSession.sessionId+ "/.pulse-client.conf"; @@ -6291,9 +6291,9 @@ void ONMainWindow::runCommand() sessionType +" 1> /dev/null 2>/dev/null & exit"; if ( startSessSndSystem ==PULSE ) { - cmd="export PULSE_CLIENTCONFIG=$HOME/.x2go/C-"+ + cmd="export PULSE_CLIENTCONFIG=\\\"${HOME}/.x2go/C-"+ resumingSession.sessionId+ - "/.pulse-client.conf;"+cmd; + "/.pulse-client.conf\\\";"+cmd; } } else @@ -6337,8 +6337,8 @@ void ONMainWindow::runCommand() void ONMainWindow::runApplication(QString exec) { - sshConnection->executeCommand ("PULSE_CLIENTCONFIG=$HOME/.x2go/C-"+ - resumingSession.sessionId+"/.pulse-client.conf DISPLAY=:"+ + sshConnection->executeCommand ("PULSE_CLIENTCONFIG=\\\"${HOME}/.x2go/C-"+ + resumingSession.sessionId+"/.pulse-client.conf\\\" DISPLAY=:"+ resumingSession.display+ " setsid "+exec+" 1> /dev/null 2>/dev/null & exit"); } @@ -11569,9 +11569,9 @@ void ONMainWindow::slotStartParec () QString passwd=getCurrentPass(); QString user=getCurrentUname(); QString host=resumingSession.server; - QString scmd="PULSE_CLIENTCONFIG=~/.x2go/C-"+ + QString scmd="PULSE_CLIENTCONFIG=\\\"${HOME}/.x2go/C-"+ resumingSession.sessionId+ - "/.pulse-client.conf "+ + "/.pulse-client.conf\\\" "+ "parec 1> /dev/null & sleep 1 && kill %1"; } #endif -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git