This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 1e448d2f53fda1913425b90d6a538c375eb9774d Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Dec 24 16:30:19 2017 +0100 testscripts/run-nxproxy2nx*: use more quotes, common variables and braces. --- testscripts/run-nxproxy2nxagent-on-localhost | 60 +++++++++++----------- testscripts/run-nxproxy2nxagent-over-network | 75 +++++++++++++--------------- testscripts/run-nxproxy2nxagent-over-sockets | 69 ++++++++++++------------- testscripts/run-nxproxy2nxproxy | 63 +++++++++++------------ testscripts/run-nxproxy2nxproxy-over-sockets | 73 +++++++++++++-------------- 5 files changed, 163 insertions(+), 177 deletions(-) diff --git a/testscripts/run-nxproxy2nxagent-on-localhost b/testscripts/run-nxproxy2nxagent-on-localhost index f06900d..d520a4c 100755 --- a/testscripts/run-nxproxy2nxagent-on-localhost +++ b/testscripts/run-nxproxy2nxagent-on-localhost @@ -27,34 +27,34 @@ #set -x # -ulimit -c unlimited +ulimit -c "unlimited" -NXPROXYBIN=nxproxy -NXAGENTBIN=nxagent +NXPROXYBIN="nxproxy" +NXAGENTBIN="nxagent" -NX_PORT=9 +NX_PORT="9" -NX_SYSTEM=${HOME}/.nx +NX_SYSTEM="${HOME}/.nx" -NX_ROOT=${HOME}/.nx +NX_ROOT="${HOME}/.nx" # # This should be randomly generated. # -#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` -NX_COOKIE=123efa980d2cba234ef6f73deac810ff +#NX_COOKIE="$(xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep 'MIT' | cut -f '5' -d ' ')" +NX_COOKIE="123efa980d2cba234ef6f73deac810ff" # # Create the directories for the NX session. # -rm -rf ${NX_ROOT}/C-${NX_PORT} || exit -mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit +rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit -rm -rf ${HOME}/.nx/S-${NX_PORT} || exit -mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit +rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit # # Set the path to libraries and NX executables. @@ -72,8 +72,8 @@ export PATH echo "Creating the X authorization cookie." -xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} -xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +xauth add "${HOSTNAME}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" +xauth add "${HOSTNAME}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" # # Options are written in a file 'options' in the session @@ -86,37 +86,37 @@ xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} # media=1:1098 # -NX_HOST=nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\ -accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +NX_HOST="nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\ +accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session" -echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options +echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options" # # Run the agent. if you don't have a font server running, # remove the argument "-fp unix/:7100" # -NX_AGENT=:${NX_PORT} +NX_AGENT=":${NX_PORT}" echo "Running the X client side NX agent." -SAVED_DISPLAY=$DISPLAY +SAVED_DISPLAY="${DISPLAY}" -DISPLAY=nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} +DISPLAY="nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}" export DISPLAY #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ -#ldd ${NXAGENTBIN} -${NXAGENTBIN} -name 'NX' -geometry 800x600+100+100 "$@" \ -${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & +#ldd "${NXAGENTBIN}" +"${NXAGENTBIN}" -name 'NX' -geometry "800x600+100+100" "${@}" \ +"${NX_AGENT}" 2>>"${NX_ROOT}/C-${NX_PORT}/session" & # # The X server side proxy will forward the connection # to the original DISPLAY. # -DISPLAY=$SAVED_DISPLAY +DISPLAY="${SAVED_DISPLAY}" export DISPLAY # @@ -127,17 +127,17 @@ export DISPLAY # connect=giulietta.nomachine.com:1098 # -#NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session -NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=localhost,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session +#NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session" +NX_HOST="nx/nx,keybd=1,samba=0,cups=0,connect=localhost,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session" -echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options +echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/S-${NX_PORT}/options" echo "Running the X server side NX proxy." #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ -#ldd ${NXPROXYBIN} -${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ -2>>${HOME}/.nx/S-${NX_PORT}/session & +#ldd "${NXPROXYBIN}" +"${NXPROXYBIN}" -S "nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}" \ +2>>"${NX_ROOT}/S-${NX_PORT}/session" & echo "Session running on display :$NX_PORT." diff --git a/testscripts/run-nxproxy2nxagent-over-network b/testscripts/run-nxproxy2nxagent-over-network index 03d9499..f160327 100755 --- a/testscripts/run-nxproxy2nxagent-over-network +++ b/testscripts/run-nxproxy2nxagent-over-network @@ -27,10 +27,10 @@ #set -x # -ulimit -c unlimited +ulimit -c "unlimited" -NXPROXYBIN=nxproxy -NXAGENTBIN=nxagent +NXPROXYBIN="nxproxy" +NXAGENTBIN="nxagent" ### ### Adapt to your needs: NXAGENT_HOST, NXPROXY_HOST @@ -41,30 +41,30 @@ NXAGENTBIN=nxagent ### ### (Instructions for copy+pasting are given when this script has been launched). ### -NXAGENT_HOST=127.0.0.1 # (e.g. 192.168.1.1, this scripts is launched on the NXAGENT_HOST machine) -NXPROXY_HOST=127.0.0.1 # (e.g. 192.168.1.2, you want to connect nxproxy -> nxagent from the NXPROXY_HOST machine) +NXAGENT_HOST="127.0.0.1" # (e.g., 192.168.1.1, this scripts is launched on the NXAGENT_HOST machine) +NXPROXY_HOST="127.0.0.1" # (e.g., 192.168.1.2, you want to connect nxproxy -> nxagent from the NXPROXY_HOST machine) -NX_PORT=9 +NX_PORT="9" -NX_SYSTEM=${HOME}/.nx +NX_SYSTEM="${HOME}/.nx" -NX_ROOT=${HOME}/.nx +NX_ROOT="${HOME}/.nx" # # This should be randomly generated. # -#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` -NX_COOKIE=123efa980d2cba234ef6f73deac810ff +#NX_COOKIE="$(xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep 'MIT' | cut -f '5' -d ' ')" +NX_COOKIE="123efa980d2cba234ef6f73deac810ff" # # Create the directories for the NX session. # -rm -rf ${NX_ROOT}/C-${NX_PORT} || exit -mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit +rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit -rm -rf ${HOME}/.nx/S-${NX_PORT} || exit -mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit +rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit # # Set the path to libraries and NX executables. @@ -82,8 +82,8 @@ export PATH echo "Creating the X authorization cookie." -xauth add ${NXPROXY_HOST}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} -xauth add ${NXPROXY_HOST}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +xauth add "${NXPROXY_HOST}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" +xauth add "${NXPROXY_HOST}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" # # Options are written in a file 'options' in the session @@ -91,63 +91,60 @@ xauth add ${NXPROXY_HOST}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} # we pass in the DISPLAY the name of the options file. # # cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, -# accept=62.98.198.1,cookie=$NX_COOKIE, +# accept=62.98.198.1,cookie=${NX_COOKIE}, # id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # media=1:1098 # -NX_HOST=nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\ -accept=$NXPROXY_HOST,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +NX_HOST="nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\ +accept=${NXPROXY_HOST},cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options +echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options" # # Run the agent. if you don't have a font server running, # remove the argument "-fp unix/:7100" # -NX_AGENT=:${NX_PORT} +NX_AGENT=":${NX_PORT}" echo "Running the X client side NX agent." -SAVED_DISPLAY=$DISPLAY +SAVED_DISPLAY="${DISPLAY}" -DISPLAY=nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} +DISPLAY="nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}" export DISPLAY #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ -#ldd ${NXAGENTBIN} -${NXAGENTBIN} -name 'NX' -geometry 800x600+100+100 "$@" \ -${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & +#ldd "${NXAGENTBIN}" +"${NXAGENTBIN}" -name 'NX' -geometry "800x600+100+100" "${@}" \ +"${NX_AGENT}" 2>>"${NX_ROOT}/C-${NX_PORT}/session" & # # The X server side proxy will forward the connection # to the original DISPLAY. # -DISPLAY=$SAVED_DISPLAY +DISPLAY="${SAVED_DISPLAY}" export DISPLAY # # These are the nxproxy options used to run a typical session. # -# cookie=$NX_COOKIE,root=/home/pinzari/.nx,media=32824, +# cookie=${NX_COOKIE},root=/home/pinzari/.nx,media=32824, # session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # connect=giulietta.nomachine.com:1098 # -echo -echo Now... COPY+PASTE the below lines to your local system -echo -echo "--------------8<---------" +printf '\n%s\n\n' 'Now... COPY+PASTE the below lines to your local system' +echo '--------------8<---------' -#NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=$NXAGENT_HOST,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session -NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=tcp:$NXAGENT_HOST:4009,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session -echo "NX_HOST=$NX_HOST" +#NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=${NXAGENT_HOST},cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session" +NX_HOST="nx/nx,keybd=1,samba=0,cups=0,connect=tcp:${NXAGENT_HOST}:4009,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session" +echo "NX_HOST=${NX_HOST}" -echo "echo \"${NX_HOST}:${NX_PORT}\" >${NX_ROOT}/S-${NX_PORT}/options" +echo "echo \"${NX_HOST}:${NX_PORT}\" >\"${NX_ROOT}/S-${NX_PORT}/options\"" -echo "${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} 2>>${HOME}/.nx/S-${NX_PORT}/session" -echo "-------------->8---------" -echo +echo "\"${NXPROXYBIN}\" -S \"nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}\" 2>>\"${NX_ROOT}/S-${NX_PORT}/session\"" +printf '%s\n\n' '-------------->8---------' diff --git a/testscripts/run-nxproxy2nxagent-over-sockets b/testscripts/run-nxproxy2nxagent-over-sockets index b0c3854..2a7e9f5 100755 --- a/testscripts/run-nxproxy2nxagent-over-sockets +++ b/testscripts/run-nxproxy2nxagent-over-sockets @@ -27,33 +27,33 @@ #set -x # -ulimit -c unlimited +ulimit -c "unlimited" -NXPROXYBIN=nxproxy -NXAGENTBIN=nxagent +NXPROXYBIN="nxproxy" +NXAGENTBIN="nxagent" -NX_PORT=7 +NX_PORT="7" -NX_SYSTEM=${HOME}/.nx +NX_SYSTEM="${HOME}/.nx" -NX_ROOT=${HOME}/.nx +NX_ROOT="${HOME}/.nx" # # This should be randomly generated. # -#NX_COOKIE=`xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep MIT | cut -f 5 -d ' '` -NX_COOKIE=123efa980d2cba234ef6f73deac810ff +#NX_COOKIE="$(xauth list |grep "${HOSTNAME}/unix:\<${NX_PORT}\>" | grep 'MIT' | cut -f '5' -d ' ')" +NX_COOKIE="123efa980d2cba234ef6f73deac810ff" # # Create the directories for the NX session. # -rm -rf ${NX_ROOT}/C-${NX_PORT} || exit -mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit +rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit -rm -rf ${HOME}/.nx/S-${NX_PORT} || exit -mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit +rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit # # Set the path to libraries and NX executables. @@ -71,13 +71,11 @@ export PATH echo "Creating the X authorization cookie." -xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} -xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +xauth add "${HOSTNAME}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" +xauth add "${HOSTNAME}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" function urlencode() { - echo "$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "$1")" - } # @@ -86,64 +84,63 @@ function urlencode() { # we pass in the DISPLAY the name of the options file. # # cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, -# accept=62.98.198.1,cookie=$NX_COOKIE, +# accept=62.98.198.1,cookie=${NX_COOKIE}, # id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # media=1:1098 # -NX_HOST=nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\ -listen=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +NX_HOST="nx/nx,cache=8192k,link=modem,menu=1,keybd=1,samba=0,cups=0,limit=0,\ +listen=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options +echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options" # # Run the agent. if you don't have a font server running, # remove the argument "-fp unix/:7100" # -NX_AGENT=:${NX_PORT} +NX_AGENT=":${NX_PORT}" echo "Running the X client side NX agent." -SAVED_DISPLAY=$DISPLAY +SAVED_DISPLAY="${DISPLAY}" -DISPLAY=nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} +DISPLAY="nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}" export DISPLAY #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ -#ldd ${NXAGENTBIN} -${NXAGENTBIN} -name 'NX' -geometry 800x600+100+100 "$@" \ -${NX_AGENT} 2>>${NX_ROOT}/C-${NX_PORT}/session & +#ldd "${NXAGENTBIN}" +"${NXAGENTBIN}" -name 'NX' -geometry '800x600+100+100' "${@}" \ +"${NX_AGENT}" 2>>"${NX_ROOT}/C-${NX_PORT}/session" & # # The X server side proxy will forward the connection # to the original DISPLAY. # -DISPLAY=$SAVED_DISPLAY +DISPLAY="${SAVED_DISPLAY}" export DISPLAY # # These are the nxproxy options used to run a typical session. # -# cookie=$NX_COOKIE,root=/home/pinzari/.nx,media=32824, +# cookie=${NX_COOKIE},root=/home/pinzari/.nx,media=32824, # session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # connect=giulietta.nomachine.com:1098 # -#NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session -NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session +#NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session" +NX_HOST="nx/nx,keybd=1,samba=0,cups=0,connect=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session" -echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options +echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/S-${NX_PORT}/options" echo "Running the X server side NX proxy." #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ -#ldd ${NXPROXYBIN} -${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ -2>>${HOME}/.nx/S-${NX_PORT}/session & - -echo "Session running on display :$NX_PORT." +#ldd "${NXPROXYBIN}" +"${NXPROXYBIN}" -S "nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}" \ +2>>"${NX_ROOT}/S-${NX_PORT}/session" & +echo "Session running on display :${NX_PORT}." diff --git a/testscripts/run-nxproxy2nxproxy b/testscripts/run-nxproxy2nxproxy index bd06dae..2f11270 100755 --- a/testscripts/run-nxproxy2nxproxy +++ b/testscripts/run-nxproxy2nxproxy @@ -29,13 +29,13 @@ set -e # set -x # -ulimit -c unlimited +ulimit -c "unlimited" -NX_PORT=8 +NX_PORT="8" -NX_SYSTEM=${HOME}/.nx +NX_SYSTEM="${HOME}/.nx" -NX_ROOT=${HOME}/.nx +NX_ROOT="${HOME}/.nx" mkdir -p "${NX_ROOT}" @@ -43,20 +43,18 @@ mkdir -p "${NX_ROOT}" # This should be randomly generated. # -NX_COOKIE=`xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep MIT | cut -f 5 -d ' ' | head -n1` -if [ -z "$NX_COOKIE" ]; then - NX_COOKIE=`mcookie` -fi +NX_COOKIE="$(xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep 'MIT' | cut -f '5' -d ' ' | head -n1)" +[[ -z "$NX_COOKIE" ]] && NX_COOKIE="$(mcookie)" # # Create the directories for the NX session. # -rm -rf ${NX_ROOT}/C-${NX_PORT} || exit -mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit +rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit -rm -rf ${HOME}/.nx/S-${NX_PORT} || exit -mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit +rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit # # Set the path to libraries and NX executables. @@ -74,8 +72,8 @@ export PATH echo "Creating the X authorization cookie." -xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} -xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +xauth add "${HOSTNAME}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" +xauth add "${HOSTNAME}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" # # Options are written in a file 'options' in the session @@ -83,24 +81,24 @@ xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} # we pass in the DISPLAY the name of the options file. # # cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, -# accept=62.98.198.1,cookie=$NX_COOKIE, +# accept=62.98.198.1,cookie=${NX_COOKIE}, # id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # media=1:1098 # -#NX_HOST=nx/nx,link=lan,pack=no-pack,keybd=1,samba=1,cups=1,limit=0,\ -#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +#NX_HOST="nx/nx,link=lan,pack=no-pack,keybd=1,samba=1,cups=1,limit=0,\ +#accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -#NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ -#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +#NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ +#accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -#NX_HOST=nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\ -#connect=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +#NX_HOST="nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\ +#connect=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ -accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ +accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options +echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options" # # Run the local proxy impersonating the X display. @@ -110,8 +108,8 @@ echo "Running the X client side NX proxy." #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --tool=memcheck --track-fds=yes \ -nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \ -2>>${HOME}/.nx/C-${NX_PORT}/session & +nxproxy -C "nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}" \ +2>>"${NX_ROOT}/C-${NX_PORT}/session" & # # The X server side proxy will forward the connection @@ -121,14 +119,14 @@ nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \ # # These are the nxproxy options used to run a typical session. # -# cookie=$NX_COOKIE,root=/home/pinzari/.nx,media=32824, +# cookie=${NX_COOKIE},root=/home/pinzari/.nx,media=32824, # session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # connect=giulietta.nomachine.com:1098 # -NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session +NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session" -echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options +echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/S-${NX_PORT}/options" echo "Running the X server side NX proxy." @@ -137,8 +135,7 @@ echo "Running the X server side NX proxy." #valgrind -v --leak-check=yes --leak-resolution=high --show-reachable=yes \ # --show-reachable=yes --suppressions=nxproxy/nxproxy.supp \ # --weird-hacks=lax-ioctls --num-callers=8 --logfile-fd=2 \ -nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ -2>>${HOME}/.nx/S-${NX_PORT}/session & - -echo "Session running on display :$NX_PORT." +nxproxy -S "nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}" \ +2>>"${NX_ROOT}/S-${NX_PORT}/session" & +echo "Session running on display :${NX_PORT}." diff --git a/testscripts/run-nxproxy2nxproxy-over-sockets b/testscripts/run-nxproxy2nxproxy-over-sockets index 30efea5..2b10543 100755 --- a/testscripts/run-nxproxy2nxproxy-over-sockets +++ b/testscripts/run-nxproxy2nxproxy-over-sockets @@ -1,6 +1,6 @@ #!/bin/bash -set -ex +set -e #/**************************************************************************/ #/* */ @@ -26,16 +26,16 @@ set -ex # # Uncomment this to enable echo. # -# set -x +set -x # -ulimit -c unlimited +ulimit -c "unlimited" -NX_PORT=6 +NX_PORT="6" -NX_SYSTEM=${HOME}/.nx +NX_SYSTEM="${HOME}/.nx" -NX_ROOT=${HOME}/.nx +NX_ROOT="${HOME}/.nx" mkdir -p "${NX_ROOT}" @@ -43,20 +43,18 @@ mkdir -p "${NX_ROOT}" # This should be randomly generated. # -NX_COOKIE=`xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep MIT | cut -f 5 -d ' ' | head -n1` -if [ -z "$NX_COOKIE" ]; then - NX_COOKIE=`mcookie` -fi +NX_COOKIE="$(xauth -n list |grep "${HOSTNAME}/unix:${NX_PORT}" | grep 'MIT' | cut -f '5' -d ' ' | head -n1)" +[[ -z "$NX_COOKIE" ]] && NX_COOKIE="$(mcookie)" # # Create the directories for the NX session. # -rm -rf ${NX_ROOT}/C-${NX_PORT} || exit -mkdir -p ${NX_ROOT}/C-${NX_PORT} || exit +rm -rf "${NX_ROOT}/C-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/C-${NX_PORT}" || exit -rm -rf ${HOME}/.nx/S-${NX_PORT} || exit -mkdir -p ${HOME}/.nx/S-${NX_PORT} || exit +rm -rf "${NX_ROOT}/S-${NX_PORT}" || exit +mkdir -p "${NX_ROOT}/S-${NX_PORT}" || exit # # Set the path to libraries and NX executables. @@ -74,13 +72,11 @@ export PATH echo "Creating the X authorization cookie." -xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} -xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} +xauth add "${HOSTNAME}/unix:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" +xauth add "${HOSTNAME}:${NX_PORT}" "MIT-MAGIC-COOKIE-1" "${NX_COOKIE}" function urlencode() { - echo "$(perl -MURI::Escape -e 'print uri_escape($ARGV[0]);' "$1")" - } # @@ -89,27 +85,27 @@ function urlencode() { # we pass in the DISPLAY the name of the options file. # # cache=8M,images=32M,link=modem,type=unix-kde,cleanup=0, -# accept=62.98.198.1,cookie=$NX_COOKIE, +# accept=62.98.198.1,cookie=${NX_COOKIE}, # id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # media=1:1098 # -#NX_HOST=nx/nx,link=lan,pack=no-pack,keybd=1,samba=1,cups=1,limit=0,\ -#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +#NX_HOST="nx/nx,link=lan,pack=no-pack,keybd=1,samba=1,cups=1,limit=0,\ +#accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -#NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ -#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +#NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ +#accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -#NX_HOST=nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\ -#connect=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +#NX_HOST="nx/nx,cache=8192k,link=modem,keybd=1,samba=1,cups=1,limit=0,\ +#connect=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -#NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ -#accept=127.0.0.1,cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +#NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ +#accept=127.0.0.1,cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -NX_HOST=nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ -listen=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=$NX_COOKIE,errors=${NX_ROOT}/C-${NX_PORT}/session +NX_HOST="nx/nx,link=lan,pack=16m-jpeg-9,keybd=1,samba=1,cups=1,limit=0,\ +listen=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=${NX_COOKIE},errors=${NX_ROOT}/C-${NX_PORT}/session" -echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options +echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/C-${NX_PORT}/options" # # Run the local proxy impersonating the X display. @@ -119,8 +115,8 @@ echo "Running the X client side NX proxy." #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --tool=memcheck --track-fds=yes \ -nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \ -2>>${HOME}/.nx/C-${NX_PORT}/session & +nxproxy -C "nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT}" \ +2>>"${NX_ROOT}/C-${NX_PORT}/session" & # # The X server side proxy will forward the connection @@ -130,14 +126,14 @@ nxproxy -C nx/nx,options=${NX_ROOT}/C-${NX_PORT}/options:${NX_PORT} \ # # These are the nxproxy options used to run a typical session. # -# cookie=$NX_COOKIE,root=/home/pinzari/.nx,media=32824, +# cookie=${NX_COOKIE},root=/home/pinzari/.nx,media=32824, # session=kde_on_giulietta,id=giulietta.nomachine.com-1098-6A4649FD0FCA57FAC275AF3F1C45B10F, # connect=giulietta.nomachine.com:1098 # -NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=$NX_COOKIE,errors=${NX_ROOT}/S-${NX_PORT}/session +NX_HOST="nx/nx,keybd=1,samba=1,cups=1,connect=$(urlencode "unix:${NX_SYSTEM}/C-${NX_PORT}/proxy.socket"),cookie=${NX_COOKIE},errors=${NX_ROOT}/S-${NX_PORT}/session" -echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options +echo "${NX_HOST}:${NX_PORT}" >"${NX_ROOT}/S-${NX_PORT}/options" echo "Running the X server side NX proxy." @@ -146,8 +142,7 @@ echo "Running the X server side NX proxy." #valgrind -v --leak-check=yes --leak-resolution=high --show-reachable=yes \ # --show-reachable=yes --suppressions=nxproxy/nxproxy.supp \ # --weird-hacks=lax-ioctls --num-callers=8 --logfile-fd=2 \ -nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ -2>>${HOME}/.nx/S-${NX_PORT}/session & - -echo "Session running on display :$NX_PORT." +nxproxy -S "nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT}" \ +2>>"${NX_ROOT}/S-${NX_PORT}/session" & +echo "Session running on display :${NX_PORT}." -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit a0003405b782dfa51bcb171fc077551497b44c69 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Dec 24 15:51:11 2017 +0100 testscripts/run-nxproxy2nx*: drop echo -ne "...\n". Besides that being a useless construct to begin with, not all shells even support parameters to echo. Nuke that abomination from or^Wthe repository. --- testscripts/run-nxproxy2nxagent-on-localhost | 9 ++++----- testscripts/run-nxproxy2nxagent-over-network | 4 ++-- testscripts/run-nxproxy2nxagent-over-sockets | 8 ++++---- testscripts/run-nxproxy2nxproxy | 8 ++++---- testscripts/run-nxproxy2nxproxy-over-sockets | 8 ++++---- 5 files changed, 18 insertions(+), 19 deletions(-) diff --git a/testscripts/run-nxproxy2nxagent-on-localhost b/testscripts/run-nxproxy2nxagent-on-localhost index d950ba3..f06900d 100755 --- a/testscripts/run-nxproxy2nxagent-on-localhost +++ b/testscripts/run-nxproxy2nxagent-on-localhost @@ -70,7 +70,7 @@ export PATH # Create the fake cookie for this display. # -echo -ne "Creating the X authorization cookie.\n" +echo "Creating the X authorization cookie." xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} @@ -98,7 +98,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options NX_AGENT=:${NX_PORT} -echo -ne "Running the X client side NX agent.\n" +echo "Running the X client side NX agent." SAVED_DISPLAY=$DISPLAY @@ -132,7 +132,7 @@ NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=localhost,cookie=$NX_COOKIE,errors= echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options -echo -ne "Running the X server side NX proxy.\n" +echo "Running the X server side NX proxy." #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ @@ -140,5 +140,4 @@ echo -ne "Running the X server side NX proxy.\n" ${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ 2>>${HOME}/.nx/S-${NX_PORT}/session & -echo -ne "Session running on display :$NX_PORT.\n" - +echo "Session running on display :$NX_PORT." diff --git a/testscripts/run-nxproxy2nxagent-over-network b/testscripts/run-nxproxy2nxagent-over-network index a433f23..03d9499 100755 --- a/testscripts/run-nxproxy2nxagent-over-network +++ b/testscripts/run-nxproxy2nxagent-over-network @@ -80,7 +80,7 @@ export PATH # Create the fake cookie for this display. # -echo -ne "Creating the X authorization cookie.\n" +echo "Creating the X authorization cookie." xauth add ${NXPROXY_HOST}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add ${NXPROXY_HOST}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} @@ -108,7 +108,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options NX_AGENT=:${NX_PORT} -echo -ne "Running the X client side NX agent.\n" +echo "Running the X client side NX agent." SAVED_DISPLAY=$DISPLAY diff --git a/testscripts/run-nxproxy2nxagent-over-sockets b/testscripts/run-nxproxy2nxagent-over-sockets index f3bfe72..b0c3854 100755 --- a/testscripts/run-nxproxy2nxagent-over-sockets +++ b/testscripts/run-nxproxy2nxagent-over-sockets @@ -69,7 +69,7 @@ export PATH # Create the fake cookie for this display. # -echo -ne "Creating the X authorization cookie.\n" +echo "Creating the X authorization cookie." xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} @@ -103,7 +103,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options NX_AGENT=:${NX_PORT} -echo -ne "Running the X client side NX agent.\n" +echo "Running the X client side NX agent." SAVED_DISPLAY=$DISPLAY @@ -137,7 +137,7 @@ NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=$(urlencode "unix:${NX_SYSTEM}/C-${ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options -echo -ne "Running the X server side NX proxy.\n" +echo "Running the X server side NX proxy." #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --num-callers=8 --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes \ @@ -145,5 +145,5 @@ echo -ne "Running the X server side NX proxy.\n" ${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ 2>>${HOME}/.nx/S-${NX_PORT}/session & -echo -ne "Session running on display :$NX_PORT.\n" +echo "Session running on display :$NX_PORT." diff --git a/testscripts/run-nxproxy2nxproxy b/testscripts/run-nxproxy2nxproxy index bb2d297..bd06dae 100755 --- a/testscripts/run-nxproxy2nxproxy +++ b/testscripts/run-nxproxy2nxproxy @@ -72,7 +72,7 @@ export PATH # Create the fake cookie for this display. # -echo -ne "Creating the X authorization cookie.\n" +echo "Creating the X authorization cookie." xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} @@ -106,7 +106,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options # Run the local proxy impersonating the X display. # -echo -ne "Running the X client side NX proxy.\n" +echo "Running the X client side NX proxy." #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --tool=memcheck --track-fds=yes \ @@ -130,7 +130,7 @@ NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=localhost,cookie=$NX_COOKIE,errors= echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options -echo -ne "Running the X server side NX proxy.\n" +echo "Running the X server side NX proxy." #cachegrind -v --dumps=100000000 \ #cachegrind -v \ @@ -140,5 +140,5 @@ echo -ne "Running the X server side NX proxy.\n" nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ 2>>${HOME}/.nx/S-${NX_PORT}/session & -echo -ne "Session running on display :$NX_PORT.\n" +echo "Session running on display :$NX_PORT." diff --git a/testscripts/run-nxproxy2nxproxy-over-sockets b/testscripts/run-nxproxy2nxproxy-over-sockets index f72e10e..30efea5 100755 --- a/testscripts/run-nxproxy2nxproxy-over-sockets +++ b/testscripts/run-nxproxy2nxproxy-over-sockets @@ -72,7 +72,7 @@ export PATH # Create the fake cookie for this display. # -echo -ne "Creating the X authorization cookie.\n" +echo "Creating the X authorization cookie." xauth add ${HOSTNAME}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} xauth add ${HOSTNAME}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE} @@ -115,7 +115,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options # Run the local proxy impersonating the X display. # -echo -ne "Running the X client side NX proxy.\n" +echo "Running the X client side NX proxy." #valgrind -v --num-callers=8 --error-limit=no --trace-children=no \ #valgrind --tool=memcheck --track-fds=yes \ @@ -139,7 +139,7 @@ NX_HOST=nx/nx,keybd=1,samba=1,cups=1,connect=$(urlencode "unix:${NX_SYSTEM}/C-${ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/S-${NX_PORT}/options -echo -ne "Running the X server side NX proxy.\n" +echo "Running the X server side NX proxy." #cachegrind -v --dumps=100000000 \ #cachegrind -v \ @@ -149,5 +149,5 @@ echo -ne "Running the X server side NX proxy.\n" nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \ 2>>${HOME}/.nx/S-${NX_PORT}/session & -echo -ne "Session running on display :$NX_PORT.\n" +echo "Session running on display :$NX_PORT." -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit 9dba2435ccc9cc5f92066de4e2e2be1d4585bc9f Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Dec 24 17:59:35 2017 +0100 nxcomp/src/ChannelEndPoint.cpp: don't use C-style casting in C++ code... --- nxcomp/src/ChannelEndPoint.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nxcomp/src/ChannelEndPoint.cpp b/nxcomp/src/ChannelEndPoint.cpp index fb8549f..a1d9608 100644 --- a/nxcomp/src/ChannelEndPoint.cpp +++ b/nxcomp/src/ChannelEndPoint.cpp @@ -103,11 +103,11 @@ ChannelEndPoint::setSpec(const char *hostName, long port) { if (hostName && strlen(hostName) && port >= 1) { length = snprintf(NULL, 0, "tcp:%s:%ld", hostName, port); - spec_ = (char *)calloc(length + 1, sizeof(char)); + spec_ = static_cast<char *>(calloc(length + 1, sizeof(char))); snprintf(spec_, length+1, "tcp:%s:%ld", hostName, port); isTCP_ = true; } - else setSpec((char*)NULL); + else setSpec(static_cast<char*>(NULL)); } bool @@ -133,7 +133,7 @@ ChannelEndPoint::getSpec(char **socketUri) const { if (length > 0) { - newSocketUri = (char *)calloc(length + 1, sizeof(char)); + newSocketUri = static_cast<char *>(calloc(length + 1, sizeof(char))); if (isUnixSocket()) snprintf(newSocketUri, length+1, "unix:%s", unixPath); else -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git