[X2go-Dev] x2goclient patch and x2goruncommand patch (was: Re: [X2go-User] [SOLVED] Re: Instructions for manual install from source tarballs on a less well-known distribution)
Mike Gabriel
mike.gabriel at das-netzwerkteam.de
Thu Aug 18 08:16:02 CEST 2011
Hi Ivan,
On Do 18 Aug 2011 01:01:55 CEST Ivan Kabaivanov wrote:
[... omitting x2goagent ldd stuff ...]
>> > And finally, I need to patch x2goclient because it's not consistent in
>> > its assumption of where the startkde script is:
>> >
>> > ~/x2goclient]# sed -i "s,/usr/bin/startkde,startkde,g" onmainwindow.cpp
>> > ~/x2goclient]# sed -i "s,startkde,/usr/local/kde/bin/startkde,g"
>> > onmainwindow_part3.cpp
>>
>> Could you send a diff for that??? x2goclient should not refer to a
>> hard coded path for startkde.
>
> something like this?
>
> diff -Naur x2goclient/onmainwindow.cpp.original x2goclient/onmainwindow.cpp
> --- x2goclient/onmainwindow.cpp.original 2011-08-18 01:30:09.000000000
> +0300
> +++ x2goclient/onmainwindow.cpp 2011-08-18 01:31:11.000000000 +0300
> @@ -2172,7 +2172,7 @@
> }
>
> }
> - sessionCmd="/usr/bin/startkde";
> + sessionCmd="startkde";
> LDAPSndSys="ARTS_SERVER";
> LDAPSndStartServer=true;
> startSound=false;
>
> diff -Naur x2goclient/x2goclient_de.ts.original x2goclient/x2goclient_de.ts
> --- x2goclient/x2goclient_de.ts.original 2011-08-18 01:30:33.000000000
> +0300
> +++ x2goclient/x2goclient_de.ts 2011-08-18 01:31:51.000000000 +0300
> @@ -2192,8 +2192,8 @@
> <translation>deaktiviert</translation>
> </message>
> <message>
> - <source>/usr/bin/startkde</source>
> - <translation type="obsolete">/usr/bin/startkde</translation>
> + <source>startkde</source>
> + <translation type="obsolete">startkde</translation>
> </message>
> <message>
> <location filename="sessionbutton.cpp" line="329"/>
>
>
>
> However, as I'm a KDE user, I can't test GNOME and LXDE.
@Alex(!!!): Why is there a hard-coded startkde path in x2goclient. I
also see remnants of Arts there when used with LDAP. Is the code maybe
outdated? What does it do? Could you check?
>> However, there currently are hard-coded path in the x2goserver
>> (server!) script ,,x2goruncommand''. This is not optimal.
>>
>> @Alex: Should we migrate them to non-fullpath calls
>>
>> /usr/bin/gnome-terminal -> gnome-terminal
>> etc.
>
> How about this:
>
> diff -Naur x2goserver/x2goserver/bin/x2goruncommand.original
> x2goserver/x2goserver/bin/x2goruncommand
> --- x2goserver/x2goserver/bin/x2goruncommand.original 2011-08-18
> 01:47:13.000000000 +0300
> +++ x2goserver/x2goserver/bin/x2goruncommand 2011-08-18 01:55:14.000000000
> +0300
> @@ -83,19 +83,18 @@
>
> if [ "$cmd" == "TERMINAL" ]; then
> IMEXIT="true"
> - if [ -e "/usr/bin/konsole" ]; then
> - cmd="/usr/bin/konsole"
> + if bash +h -c "type konsole" > /dev/null 2>&1; then
> + cmd=`type konsole | awk '{print $3}'`
> # KDE4 konsole behaves differently from other terminals
> IMEXIT="false"
> - elif [ -e "/usr/bin/gnome-terminal" ]; then
> - cmd="/usr/bin/gnome-terminal"
> - elif [ -e "/usr/bin/lxterminal" ]; then
> - cmd="/usr/bin/lxterminal"
> - elif [ -e "/usr/bin/rxvt" ]; then
> - cmd="/usr/bin/rxvt"
> - elif [ -e "/usr/bin/xterm" ]; then
> - cmd="/usr/bin/xterm"
> - fi
> + elif bash +h -c "type gnome-terminal" > /dev/null 2>&1; then
> + cmd=`type gnome-terminal | awk '{print $3}'`
> + elif bash +h -c "type lxterminal" > /dev/null 2>&1; then
> + cmd=`type lxterminal | awk '{print $3}'`
> + elif bash +h -c "type rxvt" > /dev/null 2>&1; then
> + cmd=`type rxvt | awk '{print $3}'`
> + elif bash +h -c "type xterm" > /dev/null 2>&1; then
> + cmd=`type xterm | awk '{print $3}'`
> fi
>
> EXEC=`which $cmd`
>
> actually I would remove 'which' altogether. However, type is a bash built-in
> function if I'm not mistaken, so on distributions where bash is not the
> default shell, this may present problems...
@Alex, Morty, Reinhard: any comments on this one???
> I didn't find the location of startkde hardcoded anywhere in x2goserver.
No, you are right. Desktop sessions commands are coded in the client
(and should not contain full paths...).
Greets,
Mike
--
DAS-NETZWERKTEAM
mike gabriel, dorfstr. 27, 24245 barmissen
fon: +49 (4302) 281418, fax: +49 (4302) 281419
GnuPG Key ID 0xB588399B
mail: mike.gabriel at das-netzwerkteam.de, http://das-netzwerkteam.de
freeBusy:
https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: Digitale PGP-Unterschrift
URL: <http://lists.x2go.org/pipermail/x2go-dev/attachments/20110818/041ca0cf/attachment.pgp>
More information about the x2go-dev
mailing list