The branch, master has been updated via c75449e1439bab59f673fd62113466d956aeb60c (commit) from 59c2429e0897568b5815eb50a71dbcd7b9a40188 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c75449e1439bab59f673fd62113466d956aeb60c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Aug 30 11:11:06 2011 +0200 After thinking more thoroughly about x2goprint execution variants (different x2goserver versions)... ----------------------------------------------------------------------- Summary of changes: cups-x2go | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) The diff of changes is: diff --git a/cups-x2go b/cups-x2go index 1045a0e..9f18135 100755 --- a/cups-x2go +++ b/cups-x2go @@ -92,7 +92,7 @@ sub getsessions { # Calling x2goprint with a single parameter <username> will result in an x2golistsessions --all-servers command on the # remote X2go server. - $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver 'test -f $(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName || sudo x2goprint $userName"`; + $sesslist=`ssh -i $printdsa x2goprint\@$x2goserver "which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName || sudo x2goprint $userName"`; } @sessions=split("\n",$sesslist); } @@ -110,15 +110,15 @@ sub printfile copy($tfile, "$spfile.title"); chown $uid,$gid,"$spfile"; chown $uid,$gid,"$spfile.title"; - system( "su x2goprint -c \"x2goprint $userName $sess $sess$bname $sess$bname.title\"" ); + system( "su x2goprint -c \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $sess$bname $sess$bname.title || sudo x2goprint $userName $sess $sess$bname $sess$bname.title\"" ); # log that we processed a print job - syslog('info', "su x2goprint -c \"x2goprint $userName $sess $bname $bname.title\""); + syslog('info', "su x2goprint -c \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $bname $bname.title || sudo x2goprint $userName $sess $bname $bname.title\""); } else { system ("scp -i $printdsa $pfile $tfile x2goprint\@$x2goserver:~x2goprint/"); - system( "ssh -i $printdsa x2goprint\@$x2goserver \"sudo x2goprint $userName $sess $bname $bname.title\"" ); + system( "ssh -i $printdsa x2goprint\@$x2goserver \"which x2gobasepath &>/dev/null && test -f \$(x2gobasepath)/lib/x2go/x2goprint.pl && x2goprint $userName $sess $bname $bname.title || sudo x2goprint $userName $sess $bname $bname.title\"" ); } } hooks/post-receive -- cups-x2go.git (CUPS Backend for X2go Printing) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "cups-x2go.git" (CUPS Backend for X2go Printing).