This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 75ce8f2 x2goserver/lib/x2gogetrandomport: fix function name, leading to startup failures. new b1341c2 x2goserver/lib/x2go{check,getfree}port: parameter expansion and single quotes don't mix well. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2goserver/lib/x2gocheckport | 6 +++--- x2goserver/lib/x2gogetfreeport | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit b1341c2d9aaac8e1383336a2bd2ce3e65f569c86 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jan 14 04:43:44 2018 +0100 x2goserver/lib/x2go{check,getfree}port: parameter expansion and single quotes don't mix well. Use double quotes instead. --- debian/changelog | 2 ++ x2goserver/lib/x2gocheckport | 6 +++--- x2goserver/lib/x2gogetfreeport | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 15cbf31..bee48c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -228,6 +228,8 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low now-unused NX_XINERAMA_CONF variable. - x2goserver/lib/x2gogetrandomport: fix function name, leading to startup failures. + - x2goserver/lib/x2go{check,getfree}port: parameter expansion and single + quotes don't mix well. Use double quotes instead. * 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/lib/x2gocheckport b/x2goserver/lib/x2gocheckport index 110766c..9ec668c 100644 --- a/x2goserver/lib/x2gocheckport +++ b/x2goserver/lib/x2gocheckport @@ -75,7 +75,7 @@ initialize_x2go_ports() { # If an ss command is not given, a default of "ss" is assumed. # Returns 0 on success or non-0 on failure. initialize_system_ports() { - typeset ss="${1:-'ss'}" + typeset ss="${1:-"ss"}" typeset empty_regex='^[[:space:]]*$' if [[ -z "${ss}" ]] || [[ "${ss}" =~ ${empty_regex} ]]; then @@ -180,7 +180,7 @@ check_x2go_port() { # Returns 0 if the port is free, or non-0 if it already # in use or on failure. check_system_port() { - typeset ss="${1:-'ss'}" + typeset ss="${1:-"ss"}" typeset port="${2}" typeset empty_regex='^[[:space:]]*$' @@ -225,7 +225,7 @@ check_system_port() { # in use or on failure. check_display_port() { typeset current_host_name="${1}" - typeset ss="${2:-'ss'}" + typeset ss="${2:-"ss"}" typeset port="${3}" typeset empty_regex='^[[:space:]]*$' diff --git a/x2goserver/lib/x2gogetfreeport b/x2goserver/lib/x2gogetfreeport index d657fda..726ee6e 100755 --- a/x2goserver/lib/x2gogetfreeport +++ b/x2goserver/lib/x2gogetfreeport @@ -29,10 +29,10 @@ # port number on failure. # Returns 0 on success or non-0 on failure. typeset current_host_name="${1}" -typeset ss="${2:-'ss'}" -typeset type="${3:-'lowlevel'}" -typeset start="${4:-'1'}" -typeset end="${5:-'65535'}" +typeset ss="${2:-"ss"}" +typeset type="${3:-"lowlevel"}" +typeset start="${4:-"1"}" +typeset end="${5:-"65535"}" # Check parameter sanity. typeset empty_regex='^[[:space:]]*$' -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org