This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 81b8d3da11d6970f72a92b08a2577c890ada4852 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Apr 2 23:39:16 2015 +0200 Revert "Make X2Go Server aware of Rick Astley (RICKROLL)" This reverts commit 4d93df50c4cd4d17e42a65f3939b7304a241dec9. --- debian/changelog | 3 --- x2goserver/bin/x2goruncommand | 10 +--------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 718bccc..b0991b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -173,9 +173,6 @@ x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low * New upstream version (4.0.1.20): - TERMINAL Session: Add support for qterminal (Lightweight terminal emulator written in Qt) - - Make X2Go Server aware of Rick Astley - (Single Application: Command: RICKROLL - Must be typed in manually in the client) [ Mihai Moldovan ] * New upstream version (4.0.1.20): diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 24c5e4c..ac7ff7f 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -202,11 +202,7 @@ elif [ "$cmd" == "ICEWM" ]; then cmd="/usr/bin/icewm-session" fi -# Note: RICKROLL will not be a selectable option in X2Go Client or the -# PyHoca clients. Users must type it in as the Command for a Single Application. - -if [ "$cmd" == "WWWBROWSER" ] || [ "$cmd" == "RICKROLL" ]; then - orig_cmd="$cmd" +if [ "$cmd" == "WWWBROWSER" ]; then if [ -e "/usr/bin/firefox.real" ]; then cmd="/usr/bin/firefox.real" elif [ -e "/usr/bin/iceweasel" ]; then @@ -224,10 +220,6 @@ if [ "$cmd" == "WWWBROWSER" ] || [ "$cmd" == "RICKROLL" ]; then fi fi -if [ "$orig_cmd" == "RICKROLL" ] ; then - cmd="${cmd} https://www.youtube.com/watch?v=dQw4w9WgXcQ" -fi - if [ "$cmd" == "MAILCLIENT" ]; then if [ -e "/usr/bin/thunderbird" ]; then cmd="/usr/bin/thunderbird" -- Alioth's /srv/git/code.x2go.org/x2goserver.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git