Skip to content

N
nx-libs
Commit a0003405 authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files
Options

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.
parent 6c7869ab
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 19 deletions
testscripts/run-nxproxy2nxagent-on-localhost
View file @ a0003405
...@@ -70,7 +70,7 @@ export PATH ...@@ -70,7 +70,7 @@ export PATH
# Create the fake cookie for this display. # 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}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE}
xauth add ${HOSTNAME}:${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 ...@@ -98,7 +98,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options
NX_AGENT=:${NX_PORT} 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 SAVED_DISPLAY=$DISPLAY
...@@ -132,7 +132,7 @@ NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=localhost,cookie=$NX_COOKIE,errors= ...@@ -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 "${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 -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 \ #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" ...@@ -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} \ ${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \
2>>${HOME}/.nx/S-${NX_PORT}/session & 2>>${HOME}/.nx/S-${NX_PORT}/session &
echo -ne "Session running on display :$NX_PORT.\n" echo "Session running on display :$NX_PORT."
testscripts/run-nxproxy2nxagent-over-network
View file @ a0003405
...@@ -80,7 +80,7 @@ export PATH ...@@ -80,7 +80,7 @@ export PATH
# Create the fake cookie for this display. # 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}/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}:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE}
...@@ -108,7 +108,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options ...@@ -108,7 +108,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options
NX_AGENT=:${NX_PORT} 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 SAVED_DISPLAY=$DISPLAY
......
testscripts/run-nxproxy2nxagent-over-sockets
View file @ a0003405
...@@ -69,7 +69,7 @@ export PATH ...@@ -69,7 +69,7 @@ export PATH
# Create the fake cookie for this display. # 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}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE}
xauth add ${HOSTNAME}:${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 ...@@ -103,7 +103,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options
NX_AGENT=:${NX_PORT} 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 SAVED_DISPLAY=$DISPLAY
...@@ -137,7 +137,7 @@ NX_HOST=nx/nx,keybd=1,samba=0,cups=0,connect=$(urlencode "unix:${NX_SYSTEM}/C-${ ...@@ -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 "${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 -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 \ #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" ...@@ -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} \ ${NXPROXYBIN} -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \
2>>${HOME}/.nx/S-${NX_PORT}/session & 2>>${HOME}/.nx/S-${NX_PORT}/session &
echo -ne "Session running on display :$NX_PORT.\n" echo "Session running on display :$NX_PORT."
testscripts/run-nxproxy2nxproxy
View file @ a0003405
...@@ -72,7 +72,7 @@ export PATH ...@@ -72,7 +72,7 @@ export PATH
# Create the fake cookie for this display. # 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}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE}
xauth add ${HOSTNAME}:${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 ...@@ -106,7 +106,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options
# Run the local proxy impersonating the X display. # 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 -v --num-callers=8 --error-limit=no --trace-children=no \
#valgrind --tool=memcheck --track-fds=yes \ #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= ...@@ -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 "${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 --dumps=100000000 \
#cachegrind -v \ #cachegrind -v \
...@@ -140,5 +140,5 @@ echo -ne "Running the X server side NX proxy.\n" ...@@ -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} \ nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \
2>>${HOME}/.nx/S-${NX_PORT}/session & 2>>${HOME}/.nx/S-${NX_PORT}/session &
echo -ne "Session running on display :$NX_PORT.\n" echo "Session running on display :$NX_PORT."
testscripts/run-nxproxy2nxproxy-over-sockets
View file @ a0003405
...@@ -72,7 +72,7 @@ export PATH ...@@ -72,7 +72,7 @@ export PATH
# Create the fake cookie for this display. # 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}/unix:${NX_PORT} MIT-MAGIC-COOKIE-1 ${NX_COOKIE}
xauth add ${HOSTNAME}:${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 ...@@ -115,7 +115,7 @@ echo "${NX_HOST}:${NX_PORT}" >${NX_ROOT}/C-${NX_PORT}/options
# Run the local proxy impersonating the X display. # 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 -v --num-callers=8 --error-limit=no --trace-children=no \
#valgrind --tool=memcheck --track-fds=yes \ #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-${ ...@@ -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 "${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 --dumps=100000000 \
#cachegrind -v \ #cachegrind -v \
...@@ -149,5 +149,5 @@ echo -ne "Running the X server side NX proxy.\n" ...@@ -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} \ nxproxy -S nx/nx,options=${NX_ROOT}/S-${NX_PORT}/options:${NX_PORT} \
2>>${HOME}/.nx/S-${NX_PORT}/session & 2>>${HOME}/.nx/S-${NX_PORT}/session &
echo -ne "Session running on display :$NX_PORT.\n" echo "Session running on display :$NX_PORT."
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment