[X2Go-Commits] [x2goserver] 01/03: plenty of whitespace fixes
git-admin at x2go.org
git-admin at x2go.org
Fri Jun 27 18:19:02 CEST 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit 62ea5bab863f8613c0806fd29824dee3322817b5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jun 27 18:06:31 2014 +0200
plenty of whitespace fixes
---
x2goserver/bin/x2gocmdexitmessage | 6 +--
x2goserver/bin/x2gofeature | 6 +--
x2goserver/bin/x2gofeaturelist | 6 +--
x2goserver/bin/x2golistsessions | 54 +++++++++----------
x2goserver/bin/x2goresume-session | 1 -
x2goserver/bin/x2gostartagent | 4 +-
x2goserver/bin/x2goumount-session | 39 +++++++-------
x2goserver/etc/x2go_logout | 14 ++---
x2goserver/sbin/x2gocleansessions | 56 ++++++++++----------
x2goserver/sbin/x2golistsessions_root | 38 +++++++------
x2goserver/share/x2gofeature.d/x2goserver.features | 18 +++----
11 files changed, 122 insertions(+), 120 deletions(-)
diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage
index b49e453..d8cc793 100755
--- a/x2goserver/bin/x2gocmdexitmessage
+++ b/x2goserver/bin/x2gocmdexitmessage
@@ -27,8 +27,8 @@ MESSAGE_FILE=$X2GO_ROOT/C-$1/cmdoutput
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
test -f "$MESSAGE_FILE" && {
- $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed 's/\n/ /g')"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command output starts with: $(head -n5 $MESSAGE_FILE | sed 's/\n/ /g')"
- # return command output of the command that was issued by x2goruncommand
- cat "$MESSAGE_FILE"
+ # return command output of the command that was issued by x2goruncommand
+ cat "$MESSAGE_FILE"
}
diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature
index 4728eab..54cdfea 100755
--- a/x2goserver/bin/x2gofeature
+++ b/x2goserver/bin/x2gofeature
@@ -31,9 +31,9 @@ X2GO_FEATURE=$1
# run x2gofeature scripts of X2Go extensions
test -d "$X2GO_SHARE_PATH/x2gofeature.d" && {
- for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do
- $subscript $@ && exit 0
- done
+ for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do
+ $subscript $@ && exit 0
+ done
}
echo "not available"
diff --git a/x2goserver/bin/x2gofeaturelist b/x2goserver/bin/x2gofeaturelist
index 95cb41f..683eff6 100755
--- a/x2goserver/bin/x2gofeaturelist
+++ b/x2goserver/bin/x2gofeaturelist
@@ -26,8 +26,8 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
# run x2gofeature scripts of X2Go extensions
test -d "$X2GO_SHARE_PATH/x2gofeature.d" && {
- for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do
- cat $subscript | egrep ".*\).*ok.*exit 0.*" | cut -d"\"" -f2 | cut -d"\"" -f1
- done
+ for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do
+ cat $subscript | egrep ".*\).*ok.*exit 0.*" | cut -d"\"" -f2 | cut -d"\"" -f1
+ done
}
diff --git a/x2goserver/bin/x2golistsessions b/x2goserver/bin/x2golistsessions
index 0f5fa8a..d62250b 100755
--- a/x2goserver/bin/x2golistsessions
+++ b/x2goserver/bin/x2golistsessions
@@ -48,42 +48,42 @@ if ((hostname eq '(none)') || (hostname eq 'localhost')) {
sub is_suspended
{
- my $state=get_agent_state(@_);
- if(($state eq 'SUSPENDING')||($state eq 'SUSPENDED'))
- {
- return 1;
- }
- return 0;
+ my $state=get_agent_state(@_);
+ if(($state eq 'SUSPENDING')||($state eq 'SUSPENDED'))
+ {
+ return 1;
+ }
+ return 0;
}
sub is_running
{
- my $state=get_agent_state(@_);
- if(($state eq 'STARTING')||($state eq 'RESUMING')||($state eq 'RUNNING'))
- {
- return 1;
- }
- return 0;
+ my $state=get_agent_state(@_);
+ if(($state eq 'STARTING')||($state eq 'RESUMING')||($state eq 'RUNNING'))
+ {
+ return 1;
+ }
+ return 0;
}
sub get_agent_state
{
- my $sess=@_[0];
- my $user=@_[1];
- my $state;
- my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state";
- if (! -e $stateFile )
- {
- die "state file not exists: $stateFile\n";
- }
- else
- {
- open(F,"<$stateFile");
- $state=<F>;
- close(F);
- }
- return $state;
+ my $sess=@_[0];
+ my $user=@_[1];
+ my $state;
+ my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state";
+ if (! -e $stateFile )
+ {
+ die "state file not exists: $stateFile\n";
+ }
+ else
+ {
+ open(F,"<$stateFile");
+ $state=<F>;
+ close(F);
+ }
+ return $state;
}
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 1907707..b25e2be 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -260,4 +260,3 @@ fi
echo "gr_port=$GR_PORT"
echo "sound_port=$SOUND_PORT"
echo "fs_port=$FS_PORT"
-
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index b8100f9..ce89317 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -38,11 +38,11 @@ export NX_ROOT=$X2GO_ROOT
X2GO_NXAGENT_DEFAULT_OPTIONS="-extension XFIXES -extension GLX -nolisten tcp"
if [ -r /etc/x2go/x2goagent.options ]; then
- source /etc/x2go/x2goagent.options
+ source /etc/x2go/x2goagent.options
fi
if [ -z "$X2GO_NXAGENT_OPTIONS" ]; then
- X2GO_NXAGENT_OPTIONS="$X2GO_NXAGENT_DEFAULT_OPTIONS"
+ X2GO_NXAGENT_OPTIONS="$X2GO_NXAGENT_DEFAULT_OPTIONS"
fi
REMOTE=localhost
diff --git a/x2goserver/bin/x2goumount-session b/x2goserver/bin/x2goumount-session
index 36f09ec..aab8734 100755
--- a/x2goserver/bin/x2goumount-session
+++ b/x2goserver/bin/x2goumount-session
@@ -37,26 +37,26 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
syslog('info', "x2goumount-session has been called with options: @ARGV");
# this function is a code duplication from x2gomountdirs and it will go away with
-# X2Go Server 3.2.0.0 (as the code has been moved into X2Go::Utils already in Vcs).
+# X2Go Server 4.1.0.0 (as the code has been moved into X2Go::Utils already in Vcs).
sub source_environment {
- my $name = shift;
-
- open my $fh, "<", $name
- or return -1;
-
- while (<$fh>) {
- chomp;
- my $line = $_;
- if ( $line =~ m/^#.*/ )
- {
- next;
- }
- my ($k, $v) = split /=/, $line, 2;
- $v =~ s/^(['"])(.*)\1/$2/; #' fix highlighter
- $v =~ s/\$([a-zA-Z]\w*)/$ENV{$1}/g;
- $v =~ s/`(.*?)`/`$1`/ge; #dangerous
- $ENV{$k} = $v;
- }
+ my $name = shift;
+
+ open my $fh, "<", $name
+ or return -1;
+
+ while (<$fh>) {
+ chomp;
+ my $line = $_;
+ if ( $line =~ m/^#.*/ )
+ {
+ next;
+ }
+ my ($k, $v) = split /=/, $line, 2;
+ $v =~ s/^(['"])(.*)\1/$2/; #' fix highlighter
+ $v =~ s/\$([a-zA-Z]\w*)/$ENV{$1}/g;
+ $v =~ s/`(.*?)`/`$1`/ge; #dangerous
+ $ENV{$k} = $v;
+ }
}
my $tmp_dir = '/tmp';
@@ -270,4 +270,3 @@ rmdir ("$mimeboxdir");
# closing syslog
closelog;
-
diff --git a/x2goserver/etc/x2go_logout b/x2goserver/etc/x2go_logout
index d321a03..fa359ee 100644
--- a/x2goserver/etc/x2go_logout
+++ b/x2goserver/etc/x2go_logout
@@ -2,11 +2,11 @@
# for Bash and Bash compatible shells (bash(1), ksh(1), ash(1), ...).
if [ -d /etc/x2go/x2go_logout.d ]; then
- for subscript in /etc/x2go/x2go_logout.d/*; do
- if [ -r $subscript ]; then
- # subscripts may fail, we ignore that here...
- . $subscript || true
- fi
- done
- unset subscript
+ for subscript in /etc/x2go/x2go_logout.d/*; do
+ if [ -r $subscript ]; then
+ # subscripts may fail, we ignore that here...
+ . $subscript || true
+ fi
+ done
+ unset subscript
fi
diff --git a/x2goserver/sbin/x2gocleansessions b/x2goserver/sbin/x2gocleansessions
index 349e1a1..91b9e35 100755
--- a/x2goserver/sbin/x2gocleansessions
+++ b/x2goserver/sbin/x2gocleansessions
@@ -34,7 +34,6 @@ openlog($0,'cons,pid','user');
setlogmask( LOG_UPTO(x2gologlevel()) );
-
sub check_pid
{
my $pid=shift;
@@ -56,23 +55,23 @@ sub check_pid
sub has_terminated
{
- my $state=get_agent_state(@_);
- if(($state eq 'TERMINATING')||($state eq 'TERMINATED'))
- {
- return 1;
- }
- return 0;
+ my $state=get_agent_state(@_);
+ if(($state eq 'TERMINATING')||($state eq 'TERMINATED'))
+ {
+ return 1;
+ }
+ return 0;
}
sub is_suspended
{
- my $state=get_agent_state(@_);
- if(($state eq 'SUSPENDING')||($state eq 'SUSPENDED'))
- {
- return 1;
- }
- return 0;
+ my $state=get_agent_state(@_);
+ if(($state eq 'SUSPENDING')||($state eq 'SUSPENDED'))
+ {
+ return 1;
+ }
+ return 0;
}
@@ -88,25 +87,24 @@ sub is_running
sub get_agent_state
{
- my $sess=@_[0];
- my $user=@_[1];
- my $state;
- my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state";
- if (! -e $stateFile )
- {
- die "state file not exists: $stateFile\n";
- }
- else
- {
- open(F,"<$stateFile");
- $state=<F>;
- close(F);
- }
- return $state;
+ my $sess=@_[0];
+ my $user=@_[1];
+ my $state;
+ my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state";
+ if (! -e $stateFile )
+ {
+ die "state file not exists: $stateFile\n";
+ }
+ else
+ {
+ open(F,"<$stateFile");
+ $state=<F>;
+ close(F);
+ }
+ return $state;
}
-
sub catch_term
{
unlink("/var/run/x2goserver.pid");
diff --git a/x2goserver/sbin/x2golistsessions_root b/x2goserver/sbin/x2golistsessions_root
index 058ea65..4fb27ea 100755
--- a/x2goserver/sbin/x2golistsessions_root
+++ b/x2goserver/sbin/x2golistsessions_root
@@ -34,28 +34,34 @@ setlogmask( LOG_UPTO(x2gologlevel()) );
sub is_suspended
{
- my $sess=shift;
- my $user=shift;
- my $log;
- if ( -d "/tmp-inst/${user}/.x2go-${user}" ) {
- $log="/tmp-inst/${user}/.x2go-${user}/session-C-${sess}.log";
- } else {
- $log="/tmp/.x2go-${user}/session-C-${sess}.log";
- }
- my $log_line;
- my $log_file = File::ReadBackwards->new( $log ) or return 0;
- while( defined( $log_line = $log_file->readline ) ) {
- next if ( ! ( $log_line =~ m/^Session:/ ) );
- last;
- }
- $log_file->close();
- if (($log_line =~ m/Session suspended/) || ($log_line =~ m/Suspending session/) || ($log_line =~ m/Display failure detected/))
+ my $state=get_agent_state(@_);
+ if(($state eq 'SUSPENDING')||($state eq 'SUSPENDED'))
{
return 1;
}
return 0;
}
+sub get_agent_state
+{
+ my $sess=@_[0];
+ my $user=@_[1];
+ my $state;
+ my $stateFile = "/tmp/.x2go-".$user."/C-".$sess."/state";
+ if (! -e $stateFile )
+ {
+ die "state file not exists: $stateFile\n";
+ }
+ else
+ {
+ open(F,"<$stateFile");
+ $state=<F>;
+ close(F);
+ }
+ return $state;
+}
+
+
my $x2go_lib_path = `x2gopath libexec`;
my $uname;
diff --git a/x2goserver/share/x2gofeature.d/x2goserver.features b/x2goserver/share/x2gofeature.d/x2goserver.features
index 09dc26e..12cea35 100755
--- a/x2goserver/share/x2gofeature.d/x2goserver.features
+++ b/x2goserver/share/x2gofeature.d/x2goserver.features
@@ -29,15 +29,15 @@ X2GO_FEATURE=$1
# check for X2Go server core features
case "$X2GO_FEATURE" in
- "X2GO_LIST_DESKTOPS") echo "ok"; exit 0;;
- "X2GO_MOUNTDIRS") echo "ok"; exit 0;;
- "X2GO_UMOUNTSESSION_ALL") echo "ok"; exit 0;;
- "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;;
- "X2GO_PUBLISHED_APPLICATIONS") echo "ok"; exit 0;;
- "X2GO_SERVERSIDE_DESKTOPCOMMANDS") echo "ok"; exit 0;;
- "X2GO_SET_KEYBOARD") echo "ok"; exit 0;;
- "X2GO_MOUNT_UNCPATHS") echo "ok"; exit 0;;
- *) exit -1;;
+ "X2GO_LIST_DESKTOPS") echo "ok"; exit 0;;
+ "X2GO_MOUNTDIRS") echo "ok"; exit 0;;
+ "X2GO_UMOUNTSESSION_ALL") echo "ok"; exit 0;;
+ "X2GO_UMOUNTSESSION_ONLYPATH") echo "ok"; exit 0;;
+ "X2GO_PUBLISHED_APPLICATIONS") echo "ok"; exit 0;;
+ "X2GO_SERVERSIDE_DESKTOPCOMMANDS") echo "ok"; exit 0;;
+ "X2GO_SET_KEYBOARD") echo "ok"; exit 0;;
+ "X2GO_MOUNT_UNCPATHS") echo "ok"; exit 0;;
+ *) exit -1;;
esac
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list