[X2Go-Commits] [x2goserver] 06/15: x2goserver/bin/x2goresume-session: use printf more often instead of the not-so-portable echo builtin.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit afa2f4086c9cd05707c1c9b6b6a8161f2c55c7f4
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 6 21:56:16 2021 +0100

    x2goserver/bin/x2goresume-session: use printf more often instead of the not-so-portable echo builtin.
---
 debian/changelog                  | 2 ++
 x2goserver/bin/x2goresume-session | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 592b36a4..2553f12b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -391,6 +391,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       non-functional changes.
     - x2goserver/bin/x2goresume-session: use global-scope msg variable.
     - x2goserver/bin/x2goresume-session: update copyright notice.
+    - x2goserver/bin/x2goresume-session: use printf more often instead of the
+      not-so-portable echo builtin.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 4da94741..2432c72c 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -343,7 +343,7 @@ if [[ -z "${x2go_client}" ]]; then
 	x2go_client="${current_host_name}"
 fi
 
-echo "${agent_options_new}" >"${session_dir}/options"
+printf '%s\n' "${agent_options_new}" >"${session_dir}/options"
 
 # run x2goserver-extensions for pre-resume
 x2gofeature 'X2GO_RUN_EXTENSIONS' &>'/dev/null' && x2goserver-run-extensions "${session_name}" 'pre-resume' || true
@@ -381,10 +381,7 @@ else
 	x2gofeature 'X2GO_RUN_EXTENSIONS' &>'/dev/null' && x2goserver-run-extensions "${session_name}" 'fail-resume' || true
 fi
 
-echo "gr_port=${gr_port}"
-echo "sound_port=${sound_port}"
-echo "fs_port=${fs_port}"
+printf 'gr_port=%d\nsound_port=%d\nfs_port=%d\n' "${gr_port}" "${sound_port}" "${fs_port}"
 if [[ "${telekinesis_enabled}" = '1' ]]; then
-	echo "tekictrl_port=${tekictrl_port}"
-	echo "tekidata_port=${tekidata_port}"
+	printf 'tekictrl_port=%d\ntekidata_port=%d\n' "${tekictrl_port}" "${tekidata_port}"
 fi

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git