[X2Go-Commits] [telekinesis] 03/03: syntax and quotation fixes for X2Go pre-terminate and pre-suspend script

git-admin at x2go.org git-admin at x2go.org
Wed Dec 17 23:10:45 CET 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository telekinesis.

commit c59758e37376a871809df54e9dda069c153098d1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Dec 17 23:06:19 2014 +0100

    syntax and quotation fixes for X2Go pre-terminate and pre-suspend script
    
    Conflicts:
    	server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend
    	server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate
---
 .../pre-suspend.d/100_telekinesis-server-suspend   |    6 +++---
 .../100_telekinesis-server-terminate               |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend b/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend
index e4ec62a..e5b0b32 100755
--- a/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend
+++ b/server/lib/x2go/extensions/pre-suspend.d/100_telekinesis-server-suspend
@@ -21,13 +21,13 @@
 
 export X2GO_SESSION=$1
 
-X2GO_SESSIONINFO="$(x2golistsessions | grep $X2GO_SESSION)"
-TEKICTRL_PORT="$(echo $X2GO_SESSIONINFO | cut -d '|' -f15 | sed -e 's/[^0-9\-]//g')"
+X2GO_SESSIONINFO=$(x2golistsessions | grep "$X2GO_SESSION")
+TEKICTRL_PORT=$(echo "$X2GO_SESSIONINFO" | cut -d "|" -f15 | sed -e "s/[^0-9\-]//g")
 TEKIDATA_LOCK="$HOME/.x2go/C-${X2GO_SESSION}/telekinesis-sftp.pid"
 
 # if Telekinesis server is in use for this session, try to suspend it
 if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then
-	tekicmd -setSESSIONSUSPEND=1  -setX2GOSID=${X2GO_SESSION}
+	tekicmd -setSESSIONSUSPEND=1  -setX2GOSID="${X2GO_SESSION}"
 	(if [ -f "$TEKIDATA_LOCK" ]; then
 		sleep 20
 		kill -9 $(cat "$TEKIDATA_LOCK" | sed -s 's/[^0-9]*//g');
diff --git a/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate b/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate
index dfeec80..32f28a8 100755
--- a/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate
+++ b/server/lib/x2go/extensions/pre-terminate.d/100_telekinesis-server-terminate
@@ -21,13 +21,13 @@
 
 export X2GO_SESSION=$1
 
-X2GO_SESSIONINFO="$(x2golistsessions | grep $X2GO_SESSION)"
-TEKICTRL_PORT="$(echo $X2GO_SESSIONINFO | cut -d '|' -f15 | sed -e 's/[^0-9\-]//g')"
+X2GO_SESSIONINFO=$(x2golistsessions | grep "$X2GO_SESSION")
+TEKICTRL_PORT=$(echo "$X2GO_SESSIONINFO" | cut -d "|" -f15 | sed -e "s/[^0-9\-]//g")
 TEKIDATA_LOCK="$HOME/.x2go/C-${X2GO_SESSION}/telekinesis-sftp.pid"
 
 # the session is about to be terminated, suspend Telekinesis before that happens
 if [ -n "$TEKICTRL_PORT" ] && [ "x$TEKICTRL_PORT" != "x-1" ]; then
-	tekicmd -setSESSIONSUSPEND=1  -setX2GOSID=${X2GO_SESSION}
+	tekicmd -setSESSIONSUSPEND=1  -setX2GOSID="${X2GO_SESSION}"
 	(if [ -f "$TEKIDATA_LOCK" ]; then
 		sleep 20
 		kill -9 $(cat "$TEKIDATA_LOCK" | sed -s 's/[^0-9]*//g');

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/telekinesis.git


More information about the x2go-commits mailing list