[X2Go-Commits] [nx-libs] 02/06: testscripts/run-nxproxy2nx*: drop echo -ne "...\n".
git-admin at x2go.org
git-admin at x2go.org
Sun Dec 24 18:43:47 CET 2017
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 at 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
More information about the x2go-commits
mailing list