[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-26-gadabd15
X2go dev team
git-admin at x2go.org
Tue Feb 21 14:47:16 CET 2012
The branch, master has been updated
via adabd159ef48fad1bb827c76c17a2604d30ec4b5 (commit)
from cefc9b0522ff5a9c5b996263961c94d8b5a56e62 (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 adabd159ef48fad1bb827c76c17a2604d30ec4b5
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Feb 21 14:47:11 2012 +0100
more quotation pairs
-----------------------------------------------------------------------
Summary of changes:
x2goserver/bin/x2goresume-session | 14 +++++++-------
x2goserver/bin/x2goruncommand | 2 +-
x2goserver/bin/x2gostartagent | 16 ++++++++--------
x2goserver/bin/x2gosuspend-session | 2 +-
x2goserver/bin/x2goterminate-session | 2 +-
x2goserver/bin/x2goversion | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
The diff of changes is:
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index cd856a5..e03751a 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -29,7 +29,7 @@ X2GO_KBD_TYPE="$6"
X2GO_SET_KBD="$7"
X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
-X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME`
+X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"`
X2GO_ROOT="${HOME}/.x2go"
X2GO_RESIZE=0
@@ -55,7 +55,7 @@ then
fi
-SESSIONINFO=`x2golistsessions | grep ${SESSION_NAME} | sed "s/|/,/g"`
+SESSIONINFO=`x2golistsessions | grep "${SESSION_NAME}" | sed "s/|/,/g"`
GR_PORT=`echo "$SESSIONINFO" | awk -F, {'print $9'}`
SOUND_PORT=`echo "$SESSIONINFO" | awk -F, {'print $10'}`
@@ -87,7 +87,7 @@ fi
SSH_PORT=30000 #First ssh port 30001
#Get all used in system ports from X2Go database and netstat output
-USED_PORTS=`$X2GO_LIB_PATH/x2gogetports $HOSTNAME ; netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'`
+USED_PORTS=`$X2GO_LIB_PATH/x2gogetports "$HOSTNAME"; netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++){split (lines[i],words," ");delim=split(words[4],ports,":"); if(delim>1)printf ("|%s|\n",ports[delim])} }'`
while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; do
OUTPUT=""
@@ -100,7 +100,7 @@ while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; d
#check if port in /etc/services
SERV=`grep $SSH_PORT /etc/services`
if [ "$SERV" == "" ]; then
- OUTPUT=`$X2GO_LIB_PATH/x2goinsertport $HOSTNAME $SESSION_NAME $SSH_PORT`
+ OUTPUT=`$X2GO_LIB_PATH/x2goinsertport "$HOSTNAME" "$SESSION_NAME" "$SSH_PORT"`
fi
done
if [ "$GR_PORT" == "" ]; then
@@ -125,8 +125,8 @@ KTSTR=`echo "$OPTIONS" | awk -F, {'print $12'}`
LISTSTR=`echo "$OPTIONS" | awk -F, {'print $17'}`
-KTSTR=`echo $KTSTR | sed "s/\//\\\\\\\\\//"`
-X2GO_KBD_TYPE=`echo $X2GO_KBD_TYPE | sed "s/\//\\\\\\\\\//"`
+KTSTR=`echo "$KTSTR" | sed "s/\//\\\\\\\\\//"`
+X2GO_KBD_TYPE=`echo "$X2GO_KBD_TYPE" | sed "s/\//\\\\\\\\\//"`
if [ "$X2GO_SET_KBD" == "0" ]
then
@@ -141,7 +141,7 @@ NEWOPTIONS=`echo "$OPTIONS" | sed -e "s/$LSTR/link=$X2GO_LINK/"\
-e "s/$LISTSTR/listen=$GR_PORT/"\
-e "s/$FSTR/fullscreen=$X2GO_FULLSCREEN/"`
-X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'`
+X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'`
if [ "$X2GO_CLIENT" == "" ]
then
X2GO_CLIENT="$HOSTNAME"
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 7370c38..0a664b6 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -116,7 +116,7 @@ fi
EXEC=`which $cmd`
-BNAME=`basename $EXEC`
+BNAME=`basename "$EXEC"`
if [ "$BNAME" == "rdesktop" ]
then
IMEXIT="true"
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index 5ad0e79..679852e 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -30,7 +30,7 @@ SSH_PORT=30000 #First ssh port 30001
X2GO_ROOT="${HOME}/.x2go"
REMOTE=localhost
-X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'`
+X2GO_CLIENT=`echo "$SSH_CLIENT" | awk '{print $1}'`
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''"
X2GO_GEOMETRY="$1"; shift
@@ -68,15 +68,15 @@ if [ "$X2GO_STYPE" == "S" ]; then
$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "user ,,$USER'' requests desktop sharing from user ,,$SHADOW_USER'' for desktop ,,$SHADOW_DESKTOP''"
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing command: x2godesktopsharing client $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD $USER"
- OUTPUT=`x2godesktopsharing client $X2GO_CLIENT $X2GO_GEOMETRY $X2GO_LINK $X2GO_PACK $X2GO_TYPE $X2GO_KBD_LAYOUT $X2GO_KBD_TYPE $X2GO_SET_KBD $X2GO_STYPE $X2GO_CMD $USER`
+ OUTPUT=`x2godesktopsharing client "$X2GO_CLIENT" "$X2GO_GEOMETRY" "$X2GO_LINK" "$X2GO_PACK" "$X2GO_TYPE" "$X2GO_KBD_LAYOUT" "$X2GO_KBD_TYPE" "$X2GO_SET_KBD" "$X2GO_STYPE" "$X2GO_CMD" "$USER"`
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "command result is: $OUTPUT"
if [ "$OUTPUT" == "DENY" ]; then
echo "ACCESS DENIED" 1>&2
$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: user $SHADOW_USER denied desktop sharing session"
exit -1
fi
- X2GO_COOKIE=`echo $OUTPUT | awk '{print $2}'`
- X2GO_PORT=`echo $OUTPUT | awk '{print $1}'`
+ X2GO_COOKIE=`echo "$OUTPUT" | awk '{print $2}'`
+ X2GO_PORT=`echo "$OUTPUT" | awk '{print $1}'`
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "received shadow session information: cookie: $X2GO_COOKIE, port: $X2GO_PORT"
xauth -f "$XAUTHORITY" add "${HOSTNAME}/unix:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}"
xauth -f "$XAUTHORITY" add "${HOSTNAME}:${X2GO_PORT}" MIT-MAGIC-COOKIE-1 "${X2GO_COOKIE}"
@@ -93,7 +93,7 @@ if [ "$X2GO_STYPE" == "S" ]; then
fi
LIMIT=`x2gosessionlimit`
-LWORD=`echo $LIMIT | awk '{print $1}'`
+LWORD=`echo "$LIMIT" | awk '{print $1}'`
if [ "$LWORD" == "LIMIT" ]; then
echo $LIMIT 1>&2
@@ -138,7 +138,7 @@ while [ "$OUTPUT" != "inserted" ]; do
SESSION_NAME="${SESSION_NAME}_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}"
SESSION_NAME=`echo "$SESSION_NAME" | sed -e "s/:/PP/g"`
fi
- OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession $X2GO_PORT $HOSTNAME $SESSION_NAME`
+ OUTPUT=`$X2GO_LIB_PATH/x2goinsertsession "$X2GO_PORT" "$HOSTNAME" "$SESSION_NAME"`
fi
done
@@ -154,7 +154,7 @@ while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; d
#check if port in /etc/services
SERV=`grep $SSH_PORT /etc/services`
if [ "$SERV" == "" ]; then
- OUTPUT=`$X2GO_LIB_PATH/x2goinsertport $HOSTNAME $SESSION_NAME $SSH_PORT`
+ OUTPUT=`$X2GO_LIB_PATH/x2goinsertport "$HOSTNAME" "$SESSION_NAME" "$SSH_PORT"`
fi
done
if [ "$GR_PORT" == "" ]; then
@@ -177,7 +177,7 @@ if [ "$X2GO_GEOMETRY" == "fullscreen" ]; then
fi
if [ "$X2GO_STYPE" == "S" ]; then
- X2GO_GEOMETRY=`DISPLAY=$SHADOW_DESKTOP xwininfo -root | grep geometry`
+ X2GO_GEOMETRY=`DISPLAY="$SHADOW_DESKTOP" xwininfo -root | grep geometry`
X2GO_GEOMETRY=`echo "$X2GO_GEOMETRY" | sed -e "s/ //g"`
X2GO_GEOMETRY=`echo "$X2GO_GEOMETRY" | sed -e "s/-geometry//"`
fi
diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session
index 1311d40..f823c69 100755
--- a/x2goserver/bin/x2gosuspend-session
+++ b/x2goserver/bin/x2gosuspend-session
@@ -30,7 +30,7 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME`
+X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"`
X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
# workaround for knotify, keep silent in case no knotify is running
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index 59e0944..271f714 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -30,7 +30,7 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent $SESSION_NAME`
+X2GO_AGENT_PID=`$X2GO_LIB_PATH/x2gogetagent "$SESSION_NAME"`
X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
$X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null
diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion
index fefda30..a1fea45 100755
--- a/x2goserver/bin/x2goversion
+++ b/x2goserver/bin/x2goversion
@@ -41,7 +41,7 @@ if [ -n "$1" ]; then
fi
else
cd "${X2GO_VERSIONS_BASEPATH}"
- for compfile in `ls ${X2GO_VERSIONS_BASEPATH}`; do
+ for compfile in `ls "${X2GO_VERSIONS_BASEPATH}"`; do
X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)"
X2GO_COMPONENT_VERSION="$(get_version $compfile)"
echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}"
hooks/post-receive
--
x2goserver.git (X2Go Server)
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 "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list