[X2Go-Commits] [x2goserver] 04/15: x2goserver/bin/x2goresume-session: use global-scope msg variable.

[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 e24572f81162fc8eb562577d2326d24345c591fc
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 6 21:50:15 2021 +0100

    x2goserver/bin/x2goresume-session: use global-scope msg variable.
---
 debian/changelog                  |  1 +
 x2goserver/bin/x2goresume-session | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e6a7ad7f..1c5d7b00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -389,6 +389,7 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       lowercase, rename variables to more descriptive names, use typeset all
       over the place and change the variable type for some variables. Mostly
       non-functional changes.
+    - x2goserver/bin/x2goresume-session: use global-scope msg variable.
   * 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 67a81741..7f8013f5 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -21,8 +21,9 @@
 
 typeset x2go_lib_path="$(x2gopath 'libexec')"
 
+typeset msg=''
 if [[ "${#}" -lt '7' ]]; then
-	typeset msg='not enough command line arguments'
+	msg='not enough command line arguments'
 	echo "${msg}" >&2
 	"${x2go_lib_path}/x2gosyslog" "${0}" 'err' "${msg}"
 	exit '1'
@@ -58,7 +59,7 @@ typeset fullscreen_val='0'
 typeset current_host_name=''
 
 if ! current_host_name="$(hostname)"; then
-	typeset msg="Unable to retrieve machine's hostname. This is required. Aborting session startup."
+	msg="Unable to retrieve machine's hostname. This is required. Aborting session startup."
 	"${x2go_lib_path}/x2gosyslog" "${0}" 'err' "${msg}"
 
 	# Make x2goclient fail.
@@ -79,7 +80,7 @@ typeset state="$("${x2go_lib_path}/x2gogetagentstate" "${session_name}")"
 
 # exit if session terminated
 if [[ "${state}" = 'TERMINATED' ]] || [[ "${state}" = 'TERMINATING' ]]; then
-	typeset msg="session ${session_name} terminated"
+	msg="session ${session_name} terminated"
 	echo "${msg}" >&2
 	"${x2go_lib_path}/x2gosyslog" "${0}" 'err' "${msg}"
 	exit '3'
@@ -199,7 +200,7 @@ fi
 
 typeset -i ssh_port='0'
 if ! ssh_port="$("${x2go_lib_path}/x2gogetrandomport")"; then
-	typeset msg="Unable to get (pseudo-)randomized starting port value."
+	msg="Unable to get (pseudo-)randomized starting port value."
 	"${x2go_lib_path}/x2gosyslog" "${0}" 'err' "${msg}"
 
 	# Make x2goclient fail.
@@ -231,7 +232,7 @@ while [[ -z "${gr_port}" ]] || [[ -z "${sound_port}" ]] || [[ -z "${fs_port}" ]]
 	done
 
 	if [[ "${output}" != 'inserted' ]]; then
-		typeset msg="Unable to find free port or insert new session into database; parameters: hostname (${current_host_name}), session name (${session_name}) and port (${ssh_port})."
+		msg="Unable to find free port or insert new session into database; parameters: hostname (${current_host_name}), session name (${session_name}) and port (${ssh_port})."
 		"${x2go_lib_path}/x2gosyslog" "${0}" 'err' "${msg}"
 
 		# Make x2goclient fail.

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