[X2Go-Commits] [x2goserver] 33/33: x2goserver/bin/x2goresume-session: fix most other shellcheck warnings, more quotes, curly braces et. al.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 10 00:19:25 CET 2018


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

x2go pushed a commit to branch master
in repository x2goserver.

commit f8ee1e3e59836d72a56737fa2733dba8d7d0d29b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jan 9 06:37:07 2018 +0100

    x2goserver/bin/x2goresume-session: fix most other shellcheck warnings, more quotes, curly braces et. al.
---
 debian/changelog                  |  2 ++
 x2goserver/bin/x2goresume-session | 34 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ecc274..8e6e35d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -199,6 +199,8 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low
     - x2goserver-x2goagent/etc/x2goagent.options: reenable XFIXES extension.
     - x2goserver/bin/x2gostartagent: fix most other shellcheck warnings, more
       quotes, curly braces et. al.
+    - x2goserver/bin/x2goresume-session: fix most other shellcheck warnings,
+      more quotes, curly braces et. al.
   * x2goserver.spec:
     - Only create session DB in x2goserver's post install script. Do use
       proper Requires(post) statements to make sure perl-X2Go-Server-DB and
diff --git a/x2goserver/bin/x2goresume-session b/x2goserver/bin/x2goresume-session
index 2a3258b..97a7dbb 100755
--- a/x2goserver/bin/x2goresume-session
+++ b/x2goserver/bin/x2goresume-session
@@ -181,24 +181,24 @@ if ! check_system_port "${ss}" "${FS_PORT}"; then
 	FS_PORT=''
 fi
 
-if [ "x$X2GO_TELEKINESIS_ENABLED" == "x1" ]; then
-	TEKICTRL_PORT=`echo "$SESSIONINFO" | awk -F, {'print $15'}`
-	TEKIDATA_PORT=`echo "$SESSIONINFO" | awk -F, {'print $16'}`
-	if grep -q "|${TEKICTRL_PORT}|" <<<$SYSTEM_PORTS ; then
-		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port "$TEKICTRL_PORT" is already in use"
+if [[ "${X2GO_TELEKINESIS_ENABLED}" = '1' ]]; then
+	TEKICTRL_PORT="$(awk -F ',' '{print $15}' <<< "${SESSIONINFO}")"
+	TEKIDATA_PORT="$(awk -F ',' '{print $16}' <<< "${SESSIONINFO}")"
+	if ! check_system_port "${ss}" "${TEKICTRL_PORT}"; then
+		"${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "port ${TEKICTRL_PORT} is already in use"
 		"${X2GO_LIB_PATH}/x2gormport" "${current_host_name}" "${SESSION_NAME}" "${TEKICTRL_PORT}"
-		TEKICTRL_PORT=""
+		TEKICTRL_PORT=''
 	fi
-	if grep -q "|${TEKIDATA_PORT}|" <<<$SYSTEM_PORTS ; then
-		$X2GO_LIB_PATH/x2gosyslog "$0" "debug" "port "$TEKIDATA_PORT" is already in use"
+	if ! check_system_port "${ss}" "${TEKIDATA_PORT}"; then
+		"${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "port ${TEKIDATA_PORT} is already in use"
 		"${X2GO_LIB_PATH}/x2gormport" "${current_host_name}" "${SESSION_NAME}" "${TEKIDATA_PORT}"
-		TEKIDATA_PORT=""
+		TEKIDATA_PORT=''
 	fi
 else
 	"${X2GO_LIB_PATH}/x2gormport" "${current_host_name}" "${SESSION_NAME}" "${TEKICTRL_PORT}"
 	"${X2GO_LIB_PATH}/x2gormport" "${current_host_name}" "${SESSION_NAME}" "${TEKIDATA_PORT}"
-	TEKICTRL_PORT="0"
-	TEKIDATA_PORT="0"
+	TEKICTRL_PORT='0'
+	TEKIDATA_PORT='0'
 fi
 
 if ! SSH_PORT="$("${X2GO_LIB_PATH}/x2gogetrandomport")"; then
@@ -246,11 +246,11 @@ while [[ -z "${GR_PORT}" ]] || [[ -z "${SOUND_PORT}" ]] || [[ -z "${FS_PORT}" ]]
 		GR_PORT="${SSH_PORT}"
 	elif [[ -z "${SOUND_PORT}" ]]; then
 		SOUND_PORT="${SSH_PORT}"
-	elif [ -z "${FS_PORT}" ]; then
+	elif [[ -z "${FS_PORT}" ]]; then
 		FS_PORT="${SSH_PORT}"
-	elif [ -z "${TEKICTRL_PORT}" ]; then
+	elif [[ -z "${TEKICTRL_PORT}" ]]; then
 		TEKICTRL_PORT="${SSH_PORT}"
-	elif [ -z "${TEKIDATA_PORT}" ]; then
+	elif [[ -z "${TEKIDATA_PORT}" ]]; then
 		TEKIDATA_PORT="${SSH_PORT}"
 	fi
 done
@@ -352,7 +352,7 @@ fi
 echo "gr_port=${GR_PORT}"
 echo "sound_port=${SOUND_PORT}"
 echo "fs_port=${FS_PORT}"
-if [ "x$X2GO_TELEKINESIS_ENABLED" == "x1" ]; then
-	echo "tekictrl_port=$TEKICTRL_PORT"
-	echo "tekidata_port=$TEKIDATA_PORT"
+if [[ "${X2GO_TELEKINESIS_ENABLED}" = '1' ]]; then
+	echo "tekictrl_port=${TEKICTRL_PORT}"
+	echo "tekidata_port=${TEKIDATA_PORT}"
 fi

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


More information about the x2go-commits mailing list