[X2go-Commits] x2goserver.git - master (branch) updated: 3.0.99.10-23-g3650aef
X2go dev team
git-admin at x2go.org
Tue Feb 21 14:22:28 CET 2012
The branch, master has been updated
via 3650aefe3e6399040a0fff6ccf5d174ab1d3b65d (commit)
from 9da2c4d6265d79db87121bb529901759f3c2af4f (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 3650aefe3e6399040a0fff6ccf5d174ab1d3b65d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Tue Feb 21 14:22:21 2012 +0100
Place quotations where appropriate into shell scripts.
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 1 +
.../bin/x2goserver-run-extensions | 6 +-
x2goserver-pyhoca/bin/x2gosetkeyboard | 10 ++--
x2goserver/bin/x2gocmdexitmessage | 2 +-
x2goserver/bin/x2gofeature | 2 +-
x2goserver/bin/x2goresume-session | 54 +++++++-------
x2goserver/bin/x2goruncommand | 26 ++++----
x2goserver/bin/x2gostartagent | 72 ++++++++++----------
x2goserver/bin/x2gosuspend-session | 20 +++---
x2goserver/bin/x2goterminate-session | 20 +++---
x2goserver/bin/x2goversion | 2 +-
11 files changed, 108 insertions(+), 107 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 24be3ea..4b47309 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,7 @@ x2goserver (3.1.0.0-0~x2go1) UNRELEASED; urgency=low
- Allow other $XAUTHORITY values than the default ($HOME/.Xauthority).
- For x2gomountdirs / x2goumount-session allow other TMP paths than
/tmp. Use ENV{'TMP'} instead, unless it is empty. Then use /tmp.
+ - Place quotations where appropriate into shell scripts.
* Let x2goserver package suggest x2goserver-fmbindings.
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 01 Feb 2012 13:45:00 +0100
diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions
index 3df2066..c7b671c 100755
--- a/x2goserver-extensions/bin/x2goserver-run-extensions
+++ b/x2goserver-extensions/bin/x2goserver-run-extensions
@@ -27,13 +27,13 @@ X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
-X2GO_SESSION=$1
-X2GO_MODALITY=$2
+X2GO_SESSION="$1"
+X2GO_MODALITY="$2"
# scan extensions and execute them
find /usr/lib/x2go/extensions/${X2GO_MODALITY}.d/ -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION"
- $x2go_extension $X2GO_SESSION &>/dev/null && {
+ $x2go_extension "$X2GO_SESSION" &>/dev/null && {
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension$(basename $0) for session $X2GO_SESSION has finished sucessfully"
} || {
$X2GO_LIB_PATH/x2gosyslog "$0" "warn" "$x2go_extension$(basename $0) for session $X2GO_SESSION returned a non-zero exit code, continuing..."
diff --git a/x2goserver-pyhoca/bin/x2gosetkeyboard b/x2goserver-pyhoca/bin/x2gosetkeyboard
index 26a50f8..481d01a 100755
--- a/x2goserver-pyhoca/bin/x2gosetkeyboard
+++ b/x2goserver-pyhoca/bin/x2gosetkeyboard
@@ -38,11 +38,11 @@ test -f ${X2GO_CLIENT_KBD_FILE} || exit 0
read_keyboard_file() {
# retrieve keyboard settings from keyboard file in X2Go session dir
- XKB_RULES=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
- XKB_MODEL=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
- XKB_LAYOUT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
- XKB_VARIANT=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
- XKB_OPTIONS=$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)
+ XKB_RULES="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^rules.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)"
+ XKB_MODEL="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^model.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)"
+ XKB_LAYOUT="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^layout.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)"
+ XKB_VARIANT="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^variant.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)"
+ XKB_OPTIONS="$(cat ${X2GO_CLIENT_KBD_FILE} | egrep "^options.*" | head -n1 | cut -d "=" -f2 | cut -d" " -f1)"
}
diff --git a/x2goserver/bin/x2gocmdexitmessage b/x2goserver/bin/x2gocmdexitmessage
index a8e122b..e8002ee 100755
--- a/x2goserver/bin/x2gocmdexitmessage
+++ b/x2goserver/bin/x2gocmdexitmessage
@@ -28,4 +28,4 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
$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
+cat "$MESSAGE_FILE"
diff --git a/x2goserver/bin/x2gofeature b/x2goserver/bin/x2gofeature
index 997418e..f379070 100755
--- a/x2goserver/bin/x2gofeature
+++ b/x2goserver/bin/x2gofeature
@@ -30,7 +30,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
X2GO_FEATURE=$1
# run x2gofeature scripts of X2Go extensions
-test -d $X2GO_SHARE_PATH/x2gofeature.d && {
+test -d "$X2GO_SHARE_PATH/x2gofeature.d" && {
for subscript in $X2GO_SHARE_PATH/x2gofeature.d/*.features; do
$subscript $@ && exit 0
done
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 009fd1d..cd856a5 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -20,25 +20,25 @@
# Copyright (C) 2007-2012 Oleksandr Shneyder <oleksandr.shneyder at obviously-nice.de>
# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
-SESSION_NAME=$1
-X2GO_GEOMETRY=$2
-X2GO_LINK=$3
-X2GO_PACK=$4
-X2GO_KBD_LAYOUT=$5
-X2GO_KBD_TYPE=$6
-X2GO_SET_KBD=$7
+SESSION_NAME="$1"
+X2GO_GEOMETRY="$2"
+X2GO_LINK="$3"
+X2GO_PACK="$4"
+X2GO_KBD_LAYOUT="$5"
+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_ROOT=${HOME}/.x2go
+X2GO_ROOT="${HOME}/.x2go"
X2GO_RESIZE=0
X2GO_FULLSCREEN=0
-NX_XINERAMA_CONF=$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf
-if [ -e $NX_XINERAMA_CONF ]
+NX_XINERAMA_CONF="$X2GO_ROOT/C-$SESSION_NAME/xinerama.conf"
+if [ -e "$NX_XINERAMA_CONF" ]
then
- rm $NX_XINERAMA_CONF
+ rm "$NX_XINERAMA_CONF"
fi
$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
@@ -70,17 +70,17 @@ SYSTEM_PORTS=`netstat -nt -all | awk '{ n=split($0,lines,"\n"); for(i=1;i<=n;i++
#check if saved in DB ports free
if grep -q "|${GR_PORT}|" <<<$SYSTEM_PORTS ; then
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port $GR_PORT is already in use"
- $X2GO_LIB_PATH/x2gormport $HOSTNAME $SESSION_NAME $GR_PORT
+ $X2GO_LIB_PATH/x2gormport "$HOSTNAME" "$SESSION_NAME" "$GR_PORT"
GR_PORT=""
fi
if grep -q "|${SOUND_PORT}|" <<<$SYSTEM_PORTS ; then
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port $SOUND_PORT is already in use"
- $X2GO_LIB_PATH/x2gormport $HOSTNAME $SESSION_NAME $SOUND_PORT
+ $X2GO_LIB_PATH/x2gormport "$HOSTNAME" "$SESSION_NAME" "$SOUND_PORT"
SOUND_PORT=""
fi
if grep -q "|${FS_PORT}|" <<<$SYSTEM_PORTS ; then
- $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port $FS_PORT is already in use"
- $X2GO_LIB_PATH/x2gormport $HOSTNAME $SESSION_NAME $FS_PORT
+ $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port "$FS_PORT" is already in use"
+ $X2GO_LIB_PATH/x2gormport "$HOSTNAME" "$SESSION_NAME" "$FS_PORT"
FS_PORT=""
fi
@@ -104,16 +104,16 @@ while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; d
fi
done
if [ "$GR_PORT" == "" ]; then
- GR_PORT=$SSH_PORT
+ GR_PORT="$SSH_PORT"
elif [ "$SOUND_PORT" == "" ]; then
- SOUND_PORT=$SSH_PORT
+ SOUND_PORT="$SSH_PORT"
else
- FS_PORT=$SSH_PORT
+ FS_PORT="$SSH_PORT"
fi
done
-SESSION_DIR=${X2GO_ROOT}/C-${SESSION_NAME}
+SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}"
OPTIONS=`cat ${SESSION_DIR}/options`
GSTR=`echo "$OPTIONS" | awk -F, {'print $13'}`
@@ -144,24 +144,24 @@ NEWOPTIONS=`echo "$OPTIONS" | sed -e "s/$LSTR/link=$X2GO_LINK/"\
X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'`
if [ "$X2GO_CLIENT" == "" ]
then
- X2GO_CLIENT=$HOSTNAME
+ X2GO_CLIENT="$HOSTNAME"
fi
-echo "$NEWOPTIONS" >${SESSION_DIR}/options
+echo "$NEWOPTIONS" >"${SESSION_DIR}/options"
-$X2GO_LIB_PATH/x2goresume $X2GO_CLIENT $SESSION_NAME $GR_PORT $SOUND_PORT $FS_PORT > /dev/null
+$X2GO_LIB_PATH/x2goresume "$X2GO_CLIENT" "$SESSION_NAME" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" > /dev/null
# run x2goserver-extensions for pre-resume
-x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-resume || true
+x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-resume || true
kill -HUP $X2GO_AGENT_PID &>/dev/null && {
$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "client $X2GO_CLIENT has successfully resumed session with ID $SESSION_NAME"
# resume x2godesktopsharing, if it has been in use before the session got suspended
- x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing $SESSION_NAME || true
+ x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goresume-desktopsharing "$SESSION_NAME" || true
# run x2goserver-extensions for post-resume
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-resume || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-resume || true
} || {
err_msg="ERROR: failed to resume session with ID $SESSION_NAME"
@@ -170,10 +170,10 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && {
# If we reach here it means that the x2goagent process of the session has vanisshed
# If this happens than we mark the session as finished...
- $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null
+ $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null
# run x2goserver-extensions for fail-resume
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-resume || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-resume || true
}
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index 451ee59..a7cbbda 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -36,11 +36,11 @@ export X2GO_AGENT_PID
export X2GO_SESSION
cmd=`echo $cmd |sed 's/X2GO_SPACE_CHAR/ /g'`
-X2GO_ROOT=${HOME}/.x2go
-MESSAGE_FILE=$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput
-echo "exec $cmd" >> $MESSAGE_FILE
+X2GO_ROOT="${HOME}/.x2go"
+MESSAGE_FILE="$X2GO_ROOT/C-$X2GO_SESSION/cmdoutput"
+echo "exec $cmd" >> "$MESSAGE_FILE"
-NX_XINERAMA_CONF=$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf
+NX_XINERAMA_CONF="$X2GO_ROOT/C-$X2GO_SESSION/xinerama.conf"
export NX_XINERAMA_CONF
# make Kerberos's ticket cache known inside the X2Go session
@@ -52,7 +52,7 @@ export QT_GRAPHICSSYSTEM=native
IMEXIT="false"
NX_XINERAMA_LIBS=/usr/lib/nx/X11/Xinerama
-test -n $LD_LIBRARY_PATH && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH=$NX_XINERAMA_LIBS
+test -n "$LD_LIBRARY_PATH" && LD_LIBRARY_PATH=$NX_XINERAMA_LIBS:$LD_LIBRARY_PATH || LD_LIBRARY_PATH="$NX_XINERAMA_LIBS"
export LD_LIBRARY_PATH
if [ "$sndsys" == "esd" ]; then
@@ -123,7 +123,7 @@ then
fi
# run x2goserver-extensions for pre-runcommand
-x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-runcommand || true
+x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-runcommand || true
sucessful_run=false
if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
@@ -148,26 +148,26 @@ if [ "$EXEC" != "" ] && [ -x $EXEC ]; then
successful_run=true
# run x2goserver-extensions for post-runcommand
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-runcommand || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-runcommand || true
else
$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: command $EXEC failed to execute"
- echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > $MESSAGE_FILE
+ echo "X2GORUNCOMMAND ERR NOEXEC:$cmd" > "$MESSAGE_FILE"
# run x2goserver-extensions for fail-runcommand
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-runcommand || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-runcommand || true
fi
# stop x2godesktopsharing process gracefully...
-x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate $X2GO_SESSION || true
+x2gofeature X2GO_DESKTOPSHARING >/dev/null && x2godesktopsharing-terminate "$X2GO_SESSION" || true
kill -TERM $X2GO_AGENT_PID
-$X2GO_LIB_PATH/x2gochangestatus 'F' $X2GO_SESSION > /dev/null
+$X2GO_LIB_PATH/x2gochangestatus 'F' "$X2GO_SESSION" > /dev/null
export HOSTNAME
-x2goumount-session $X2GO_SESSION
+x2goumount-session "$X2GO_SESSION"
# clean up session dir if not in debug mode and if session has been successful
if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ] && [ "x$successful_run" = "xtrue" ]; then
- (sleep 10; rm -Rf $HOME/.x2go/C-$X2GO_SESSION)&
+ (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")&
fi
diff --git a/x2goserver/bin/x2gostartagent b/x2goserver/bin/x2gostartagent
index fe1ccee..486451b 100755
--- a/x2goserver/bin/x2gostartagent
+++ b/x2goserver/bin/x2gostartagent
@@ -27,21 +27,21 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
X2GO_PORT=49 #First port for X2GO=50
SSH_PORT=30000 #First ssh port 30001
-X2GO_ROOT=${HOME}/.x2go
+X2GO_ROOT="${HOME}/.x2go"
REMOTE=localhost
X2GO_CLIENT=`echo $SSH_CLIENT | awk '{print $1}'`
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "client announced itself as ,,$X2GO_CLIENT''"
-X2GO_GEOMETRY=$1; shift
-X2GO_LINK=$1; shift
-X2GO_PACK=$1; shift
-X2GO_TYPE=$1; shift
-X2GO_KBD_LAYOUT=$1; shift
-X2GO_KBD_TYPE=$1; shift
-X2GO_SET_KBD=$1; shift
-X2GO_STYPE=$1; shift
-X2GO_CMD=$1; shift
+X2GO_GEOMETRY="$1"; shift
+X2GO_LINK="$1"; shift
+X2GO_PACK="$1"; shift
+X2GO_TYPE="$1"; shift
+X2GO_KBD_LAYOUT="$1"; shift
+X2GO_KBD_TYPE="$1"; shift
+X2GO_SET_KBD="$1"; shift
+X2GO_STYPE="$1"; shift
+X2GO_CMD="$1"; shift
X2GO_RESIZE=0
X2GO_FULLSCREEN=0
@@ -60,7 +60,7 @@ if [ "$X2GO_STYPE" == "S" ]; then
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "shadow session requested: mode $SHADOW_MODE, user: $SHADOW_USER, desktop: $SHADOW_DESKTOP"
} || {
- SHADREQ_USER=$1; shift
+ SHADREQ_USER="$1"; shift
$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "preparing shadow session request for user $SHADREQ_USER, agent starts for user ${USER}"
}
@@ -78,8 +78,8 @@ if [ "$X2GO_STYPE" == "S" ]; then
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}
+ 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}"
echo $X2GO_PORT
echo $X2GO_COOKIE
@@ -100,7 +100,7 @@ if [ "$LWORD" == "LIMIT" ]; then
exit -1
fi
-export NX_CLIENT=$X2GO_LIB_PATH/x2gosuspend-agent
+export NX_CLIENT="$X2GO_LIB_PATH/x2gosuspend-agent"
COLORDEPTH=`echo "$X2GO_TYPE"|awk '{split($0,a,"-depth_"); print a[2]}'`
@@ -113,7 +113,7 @@ elif [ "$X2GO_STYPE" == "S" ]; then
fi
if [ "$X2GO_CLIENT" == "" ]; then
- X2GO_CLIENT=$HOSTNAME
+ X2GO_CLIENT="$HOSTNAME"
fi
USED_DISPLAYS=`$X2GO_LIB_PATH/x2gogetdisplays $HOSTNAME`
@@ -133,9 +133,9 @@ while [ "$OUTPUT" != "inserted" ]; do
grep -q "|${NX_PORT}|" <<<$USED_PORTS ; then
OUTPUT="XXX"
else
- SESSION_NAME=${USER}-${X2GO_PORT}-`date +"%s"`
+ SESSION_NAME="${USER}-${X2GO_PORT}-`date +\"%s\"`"
if [ "$COLORDEPTH" != "" ]; then
- SESSION_NAME="$SESSION_NAME"_st${SESSION_TYPE}${X2GO_CMD}_dp${COLORDEPTH}
+ 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`
@@ -158,11 +158,11 @@ while [ "$GR_PORT" == "" ] || [ "$SOUND_PORT" == "" ] || [ "$FS_PORT" == "" ]; d
fi
done
if [ "$GR_PORT" == "" ]; then
- GR_PORT=$SSH_PORT
+ GR_PORT="$SSH_PORT"
elif [ "$SOUND_PORT" == "" ]; then
- SOUND_PORT=$SSH_PORT
+ SOUND_PORT="$SSH_PORT"
else
- FS_PORT=$SSH_PORT
+ FS_PORT="$SSH_PORT"
fi
done
@@ -182,18 +182,18 @@ if [ "$X2GO_STYPE" == "S" ]; then
X2GO_GEOMETRY=`echo "$X2GO_GEOMETRY" | sed -e "s/-geometry//"`
fi
-SESSION_DIR=${X2GO_ROOT}/C-${SESSION_NAME}
+SESSION_DIR="${X2GO_ROOT}/C-${SESSION_NAME}"
-if [ ! -d $X2GO_ROOT ]; then
- mkdir $X2GO_ROOT
+if [ ! -d "$X2GO_ROOT" ]; then
+ mkdir "$X2GO_ROOT"
fi
-if [ ! -d $X2GO_ROOT/ssh ]; then
- mkdir $X2GO_ROOT/ssh
+if [ ! -d "$X2GO_ROOT/ssh" ]; then
+ mkdir "$X2GO_ROOT/ssh"
fi
-if [ ! -d $SESSION_DIR ]; then
- mkdir $SESSION_DIR
+if [ ! -d "$SESSION_DIR" ]; then
+ mkdir "$SESSION_DIR"
fi
X2GO_COOKIE=`mcookie`
@@ -204,8 +204,8 @@ PATH="${PATH}:${X2GO_BIN}/"
export PATH
-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}
+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}"
if [ "$X2GO_SET_KBD" == "0" ]
@@ -216,7 +216,7 @@ else
fi
-echo "${X2GO_HOST}:${X2GO_PORT}" >${SESSION_DIR}/options
+echo "${X2GO_HOST}:${X2GO_PORT}" >"${SESSION_DIR}/options"
NX_AGENT=":${X2GO_PORT}"
SAVED_DISPLAY="$DISPLAY"
@@ -237,14 +237,14 @@ else
fi
# run x2goserver-extensions for pre-start
-x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-start || true
+x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-start || true
SESSION_WINDOW_TITLE="X2GO-${SESSION_NAME}"
if [ "$X2GO_STYPE" == "S" ]; then
- x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth $XAUTHORITY -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+ x2goagent $X2GODPIOPTION_ -$SESSION_TYPE -auth "$XAUTHORITY" -shadow $SHADOW_DESKTOP -shadowmode $SHADOW_MODE -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" &
else
- x2goagent $X2GODPIOPTION_ $XDMCPOPT -$SESSION_TYPE -auth $XAUTHORITY -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" ${NX_AGENT} 2>${SESSION_DIR}/session.log &
+ x2goagent $X2GODPIOPTION_ "$XDMCPOPT" -$SESSION_TYPE -auth "$XAUTHORITY" -geometry ${X2GO_GEOMETRY} -name "${SESSION_WINDOW_TITLE}" "${NX_AGENT}" 2>"${SESSION_DIR}/session.log" &
fi
@@ -254,19 +254,19 @@ test $X2GO_AGENT_RETVAL && {
$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "successfully started X2Go agent session with ID $SESSION_NAME"
# run x2goserver-extensions for post-start
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-start || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-start || true
} || {
$X2GO_LIB_PATH/x2gosyslog "$0" "err" "ERROR: failed to start X2Go agent session with ID $SESSION_NAME"
# run x2goserver-extensions for fail-start
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-start || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-start || true
}
X2GO_SND_PORT=1024
-$X2GO_LIB_PATH/x2gocreatesession $X2GO_COOKIE $X2GO_AGENT_PID $X2GO_CLIENT $GR_PORT $SOUND_PORT $FS_PORT $SESSION_NAME > /dev/null
+$X2GO_LIB_PATH/x2gocreatesession "$X2GO_COOKIE" "$X2GO_AGENT_PID" "$X2GO_CLIENT" "$GR_PORT" "$SOUND_PORT" "$FS_PORT" "$SESSION_NAME" > /dev/null
echo $X2GO_PORT
echo $X2GO_COOKIE
diff --git a/x2goserver/bin/x2gosuspend-session b/x2goserver/bin/x2gosuspend-session
index b9eeb7f..1311d40 100755
--- a/x2goserver/bin/x2gosuspend-session
+++ b/x2goserver/bin/x2gosuspend-session
@@ -21,9 +21,9 @@
# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
if [ $# -eq 1 ]; then
- SESSION_NAME=$1
+ SESSION_NAME="$1"
else
- SESSION_NAME=$X2GO_SESSION
+ SESSION_NAME="$X2GO_SESSION"
fi
X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
@@ -36,19 +36,19 @@ X2GO_AGENT_PID=`echo "$X2GO_AGENT_PID"| awk {'print $1'}`
# workaround for knotify, keep silent in case no knotify is running
killall -HUP knotify &>/dev/null
-$X2GO_LIB_PATH/x2gochangestatus 'S' $SESSION_NAME > /dev/null
+$X2GO_LIB_PATH/x2gochangestatus 'S' "$SESSION_NAME" > /dev/null
# terminate x2godesktopsharing instance and remember that it was running...
-x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2gosuspend-desktopsharing $SESSION_NAME || true
+x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2gosuspend-desktopsharing "$SESSION_NAME" || true
# run x2goserver-extensions for pre-suspend
-x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-suspend || true
+x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-suspend || true
kill -HUP $X2GO_AGENT_PID &>/dev/null && {
$X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been suspended successfully"
# run x2goserver-extensions for post-suspend
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-suspend || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-suspend || true
} || {
err_msg="ERROR: failed to suspend session with ID $SESSION_NAME"
@@ -57,13 +57,13 @@ kill -HUP $X2GO_AGENT_PID &>/dev/null && {
# If we reach here it means that the x2goagent process of the session has vanisshed
# If this happens than we mark the session as finished...
- $X2GO_LIB_PATH/x2gochangestatus 'F' $SESSION_NAME > /dev/null
+ $X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null
# run x2goserver-extensions for fail-suspend
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-suspend || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-suspend || true
}
-export HOSTNAME
-x2goumount-session $SESSION_NAME
+export HOSTNAME
+x2goumount-session "$SESSION_NAME"
diff --git a/x2goserver/bin/x2goterminate-session b/x2goserver/bin/x2goterminate-session
index 10df64a..59e0944 100755
--- a/x2goserver/bin/x2goterminate-session
+++ b/x2goserver/bin/x2goterminate-session
@@ -21,9 +21,9 @@
# Copyright (C) 2007-2012 Heinz-Markus Graesing <heinz-m.graesing at obviously-nice.de>
if [ $# -eq 1 ]; then
- SESSION_NAME=$1
+ SESSION_NAME="$1"
else
- SESSION_NAME=$X2GO_SESSION
+ SESSION_NAME="$X2GO_SESSION"
fi
X2GO_LIB_PATH=`echo -n \$(x2gobasepath)/lib/x2go`
@@ -33,19 +33,19 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@"
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
+$X2GO_LIB_PATH/x2gochangestatus 'F' "$SESSION_NAME" > /dev/null
# stop x2godesktopsharing process gracefully...
-x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing $SESSION_NAME || true
+x2gofeature X2GO_DESKTOPSHARING &>/dev/null && x2goterminate-desktopsharing "$SESSION_NAME" || true
# run x2goserver-extensions for pre-terminate
-x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME pre-terminate || true
+x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" pre-terminate || true
kill -TERM $X2GO_AGENT_PID &>/dev/null && {
- $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID $SESSION_NAME has been terminated successfully"
+ $X2GO_LIB_PATH/x2gosyslog "$0" "notice" "session with ID "$SESSION_NAME" has been terminated successfully"
# run x2goserver-extensions for post-terminate
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME post-terminate || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" post-terminate || true
} || {
err_msg="ERROR: failed to terminate session with ID $SESSION_NAME"
@@ -56,14 +56,14 @@ kill -TERM $X2GO_AGENT_PID &>/dev/null && {
$X2GO_LIB_PATH/x2gosyslog "$0" "err" "$err_msg"
# run x2goserver-extensions for fail-terminate
- x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions $SESSION_NAME fail-terminate || true
+ x2gofeature X2GO_RUN_EXTENSIONS &>/dev/null && x2goserver-run-extensions "$SESSION_NAME" fail-terminate || true
}
export HOSTNAME
-x2goumount-session $SESSION_NAME
+x2goumount-session "$SESSION_NAME"
# if we are not running in log level debug (=7) then clean up session dir
if [ "$($X2GO_LIB_PATH/x2gologlevel)" != "7" ]; then
- (sleep 10; rm -Rf $HOME/.x2go/C-$X2GO_SESSION)&
+ (sleep 10; rm -Rf "$HOME/.x2go/C-$X2GO_SESSION")&
fi
diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion
index 3720bf0..fefda30 100755
--- a/x2goserver/bin/x2goversion
+++ b/x2goserver/bin/x2goversion
@@ -40,7 +40,7 @@ if [ -n "$1" ]; then
echo "Version information for X2Go component '$X2GO_COMPONENT' is not available." >&1
fi
else
- cd ${X2GO_VERSIONS_BASEPATH}
+ cd "${X2GO_VERSIONS_BASEPATH}"
for compfile in `ls ${X2GO_VERSIONS_BASEPATH}`; do
X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)"
X2GO_COMPONENT_VERSION="$(get_version $compfile)"
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