[X2Go-Commits] [x2goserver] 01/01: x2goversion: Fix situations where ${compfile} contains a non-absolute path (e.g. it contains '../').

[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 c80103788eebe0445efc2cefb56b074231b76f39
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sat Dec 1 11:42:40 2018 +0100

    x2goversion: Fix situations where ${compfile} contains a non-absolute path (e.g. it contains '../').
---
 debian/changelog           | 2 ++
 x2goserver/bin/x2goversion | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2f787cb..68fbed2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ x2goserver (4.1.0.4-0x2go1) UNRELEASED; urgency=medium
   * New upstream version (4.1.0.4):
     - Fix version number in VERSION.x2goserver-desktopsharing.
     - x2goserver-x2goagent: Drop x2goagent.keyboard file.
+    - x2goversion: Fix situations where ${compfile} contains a
+      non-absolute path (e.g. it contains '../').
   * debian/x2goserver.postinst:
     + Drop duplicate sourcing of debconf includes.
 
diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion
index aa960a2..50e45c0 100755
--- a/x2goserver/bin/x2goversion
+++ b/x2goserver/bin/x2goversion
@@ -42,7 +42,7 @@ if [ -n "${1}" ]; then
 else
 	cd "${X2GO_VERSIONS_BASEPATH}"
 	for compfile in "${X2GO_VERSIONS_BASEPATH}"/*; do
-		X2GO_COMPONENT="$(echo "${compfile}" | cut -d '.' -f '2')"
+		X2GO_COMPONENT="$(echo "$(basename ${compfile})" | cut -d '.' -f '2')"
 		X2GO_COMPONENT_VERSION="$(get_version "${compfile}")"
 		echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}"
 	done

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