This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 34353d2 x2goserver.spec: also pass %{__global_{c{,pp},ld}flags} down via {C,LD}FLAGS. new c706cef debian/x2goserver-desktopsharing.postinst: more curly braces, quotes etc. new 51e4a7d debian/x2goserver-desktopsharing.config: more curly braces, quotes etc. new f99c3df debian/x2goserver-desktopsharing.postrm: more curly braces, quotes etc. new 680e3ab debian/libx2go-server-db-perl.postinst: replace historical "egrep" with "grep -E". new e2b3c6c debian/x2goserver.config: replace historical "egrep" with "grep -E". new 26618f4 debian/x2goserver.config: more curly braces, quotes etc. new a48603d x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: replace historical "egrep" with "grep -E". new 5fa1009 x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: don't use negative exit codes. new 621f47d x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: more curly braces, quotes etc. new 80349bd x2goserver-extensions/bin/x2goserver-run-extensions: replace historical "egrep" with "grep -E". new a9c4006 x2goserver-extensions/bin/x2goserver-run-extensions: don't use negative exit codes. new 82d1e41 x2goserver-extensions/bin/x2goserver-run-extensions: more curly braces, quotes etc. new 3a99607 x2goserver/bin/x2gofeaturelist: replace historical "egrep" with "grep -E". new 865d66b x2goserver/bin/x2gofeaturelist: more curly braces, quotes etc. new 27382e8 x2goserver/bin/x2goruncommand: replace historical "egrep" with "grep -E". new 26729b6 x2goserver/bin/x2goversion: replace historical "egrep" with "grep -E". new 26a3e54 x2goserver/bin/x2goversion: more curly braces, quotes etc. The 17 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 | 30 ++++++ debian/libx2go-server-db-perl.postinst | 2 +- debian/x2goserver-desktopsharing.config | 50 ++++----- debian/x2goserver-desktopsharing.postinst | 115 ++++++++++----------- debian/x2goserver-desktopsharing.postrm | 8 +- debian/x2goserver.config | 26 ++--- .../bin/x2goterminate-desktopsharing | 48 ++++----- .../bin/x2goserver-run-extensions | 25 +++-- x2goserver/bin/x2gofeaturelist | 14 +-- x2goserver/bin/x2goruncommand | 2 +- x2goserver/bin/x2goversion | 28 ++--- 11 files changed, 186 insertions(+), 162 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 c706cef34d81f05833f5522aedf533b2435fda06 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 02:55:11 2018 +0100 debian/x2goserver-desktopsharing.postinst: more curly braces, quotes etc. --- debian/changelog | 2 + debian/x2goserver-desktopsharing.postinst | 115 ++++++++++++++---------------- 2 files changed, 57 insertions(+), 60 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1845523..789b031 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. + Also pass %{__global_{c{,pp},ld}flags} down via {C,LD}FLAGS. + * debian/x2goserver-desktopsharing.postinst: + + More curly braces, quotes etc. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 14 Aug 2018 16:41:40 +0200 diff --git a/debian/x2goserver-desktopsharing.postinst b/debian/x2goserver-desktopsharing.postinst index 94a4e89..3ece3d4 100755 --- a/debian/x2goserver-desktopsharing.postinst +++ b/debian/x2goserver-desktopsharing.postinst @@ -1,11 +1,9 @@ #!/bin/sh - -set -e - # postinst script for x2godesktopsharing # # see: dh_installdeb(1) +set -e # summary of how this script can be called: # * <postinst> `configure' <most-recently-configured-version> @@ -20,74 +18,71 @@ set -e # the debian-policy package # Source debconf library. -. /usr/share/debconf/confmodule - -case "$1" in - configure) - - # fetch debconf-variables for x2godesktopsharing - db_get x2goserver-desktopsharing/create-group-for-sharing && x2godesktopsharing_create_group_for_sharing=$RET - db_get x2goserver-desktopsharing/use-existing-group-for-sharing && x2godesktopsharing_use_existing_group_for_sharing=$RET +. '/usr/share/debconf/confmodule' - # create debconf-configured sharing group +case "${1}" in + 'configure') + # fetch debconf-variables for x2godesktopsharing + db_get 'x2goserver-desktopsharing/create-group-for-sharing' && x2godesktopsharing_create_group_for_sharing="${RET}" + db_get 'x2goserver-desktopsharing/use-existing-group-for-sharing' && x2godesktopsharing_use_existing_group_for_sharing="${RET}" - group="" - if [ "$x2godesktopsharing_create_group_for_sharing" = "true" ] || [ "$x2godesktopsharing_use_existing_group_for_sharing" = "true" ]; then - db_get x2goserver-desktopsharing/group-sharing - # for sanity: we take everything as a group name until we find a blank... - group=$(echo $RET | cut -d" " -f1) - fi + # create debconf-configured sharing group - if [ "$x2godesktopsharing_create_group_for_sharing" = "true" ] && [ "x$group" != "x" ]; then - # this should create the hard-coded "x2godesktopsharing" group - if ! getent group $group >/dev/null; then - echo "Creating $group group." 1>&2 - addgroup --system $group - else - echo "Group »$group« already exists." 1>&2 + group='' + if [ "${x2godesktopsharing_create_group_for_sharing}" = 'true' ] || [ "${x2godesktopsharing_use_existing_group_for_sharing}" = 'true' ]; then + db_get 'x2goserver-desktopsharing/group-sharing' + # for sanity: we take everything as a group name until we find a blank... + group="$(echo "${RET}" | cut -d ' ' -f '1')" fi - fi - if [ "$x2godesktopsharing_use_existing_group_for_sharing" = "true" ] && [ "x$group" != "x" ]; then - if echo "$group" | egrep '^[[:digit:]]{1,5}$' 1>/dev/null; then - echo "Specified sharing group is a gidNumber." 1>&2 - group=$(getent group $group | cut -d":" -f1) + if [ "${x2godesktopsharing_create_group_for_sharing}" = 'true' ] && [ -n "${group}" ]; then + # this should create the hard-coded "x2godesktopsharing" group + if ! getent 'group' "${group}" >'/dev/null'; then + echo "Creating »${group}« group." 1>&2 + addgroup --system "${group}" + else + echo "Group »${group}« already exists." 1>&2 + fi fi - fi - if [ -z "$group" ]; then - group="root" - fi - - # finally tweak X2Go Desktop Sharing's configuration file and adapt the group parameter - sed -i /etc/x2go/desktopsharing/settings -e "s/group=.*/group=$group/" + if [ "${x2godesktopsharing_use_existing_group_for_sharing}" = 'true' ] && [ -n "${group}" ]; then + if echo "${group}" | grep -Eq '^[[:digit:]]{1,5}$' 1>'/dev/null'; then + echo 'Specified sharing group is a group ID.' 1>&2 + group="$(getent 'group' "${group}" | cut -d ':' -f '1')" + fi + fi - db_get x2goserver-desktopsharing/auto-start-on-logon - if [ "$RET" = "true" ] && [ ! -e /etc/xdg/autostart/x2godesktopsharing.desktop ]; then - echo "Setting up system-wide XDG autostart for X2Go Desktop Sharing." - cp /usr/share/applications/x2godesktopsharing.desktop /etc/xdg/autostart/x2godesktopsharing.desktop - elif [ "$RET" = "false" ] && [ -f /etc/xdg/autostart/x2godesktopsharing.desktop ]; then - echo "Disabling system-wide XDG autostart for X2Go Desktop Sharing." - rm -f /etc/xdg/autostart/x2godesktopsharing.desktop - fi + if [ -z "${group}" ]; then + group='root' + fi - db_get x2goserver-desktopsharing/auto-activate-on-logon - if [ "$RET" = "true" ] && [ -e /etc/xdg/autostart/x2godesktopsharing.desktop ]; then - echo "Setting up system-wide auto-activation of X2Go Desktop Sharing." - sed -i /etc/xdg/autostart/x2godesktopsharing.desktop -e 's@^Exec=.*@Exec=/usr/bin/x2godesktopsharing --activate-desktop-sharing@' - elif [ "$RET" = "false" ] && [ -e /etc/xdg/autostart/x2godesktopsharing.desktop ]; then - echo "Disabling system-wide auto-activation of X2Go Desktop Sharing." - sed -i /etc/xdg/autostart/x2godesktopsharing.desktop -e 's@^Exec=.*@Exec=/usr/bin/x2godesktopsharing@' - fi - ;; + # finally tweak X2Go Desktop Sharing's configuration file and adapt the group parameter + sed -i '/etc/x2go/desktopsharing/settings' -e "s/group=.*/group=${group}/" - abort-upgrade|abort-remove|abort-deconfigure) - ;; + db_get 'x2goserver-desktopsharing/auto-start-on-logon' + if [ "${RET}" = 'true' ] && [ ! -e '/etc/xdg/autostart/x2godesktopsharing.desktop' ]; then + echo 'Setting up system-wide XDG autostart for X2Go Desktop Sharing.' + cp '/usr/share/applications/x2godesktopsharing.desktop' '/etc/xdg/autostart/x2godesktopsharing.desktop' + elif [ "${RET}" = 'false' ] && [ -f '/etc/xdg/autostart/x2godesktopsharing.desktop' ]; then + echo 'Disabling system-wide XDG autostart for X2Go Desktop Sharing.' + rm -f '/etc/xdg/autostart/x2godesktopsharing.desktop' + fi + db_get 'x2goserver-desktopsharing/auto-activate-on-logon' + if [ "${RET}" = 'true' ] && [ -e '/etc/xdg/autostart/x2godesktopsharing.desktop' ]; then + echo 'Setting up system-wide auto-activation of X2Go Desktop Sharing.' + sed -i '/etc/xdg/autostart/x2godesktopsharing.desktop' -e 's@^Exec=.*@Exec=/usr/bin/x2godesktopsharing --activate-desktop-sharing@' + elif [ "${RET}" = 'false' ] && [ -e '/etc/xdg/autostart/x2godesktopsharing.desktop' ]; then + echo 'Disabling system-wide auto-activation of X2Go Desktop Sharing.' + sed -i '/etc/xdg/autostart/x2godesktopsharing.desktop' -e 's@^Exec=.*@Exec=/usr/bin/x2godesktopsharing@' + fi + ;; + 'abort-upgrade'|'abort-remove'|'abort-deconfigure') + ;; *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; + echo "postinst called with unknown argument '${1}'" >&2 + exit '1' + ;; esac # dh_installdeb will replace this with shell code automatically @@ -95,4 +90,4 @@ esac #DEBHELPER# -exit 0 +exit '0' -- 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 51e4a7d67ac1964748f77e73c7c9e1078a152ae5 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 02:55:59 2018 +0100 debian/x2goserver-desktopsharing.config: more curly braces, quotes etc. --- debian/changelog | 2 ++ debian/x2goserver-desktopsharing.config | 50 ++++++++++++++++----------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/debian/changelog b/debian/changelog index 789b031..616a29d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + Also pass %{__global_{c{,pp},ld}flags} down via {C,LD}FLAGS. * debian/x2goserver-desktopsharing.postinst: + More curly braces, quotes etc. + * debian/x2goserver-desktopsharing.config: + + More curly braces, quotes etc. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 14 Aug 2018 16:41:40 +0200 diff --git a/debian/x2goserver-desktopsharing.config b/debian/x2goserver-desktopsharing.config index 7cdaf70..b281106 100755 --- a/debian/x2goserver-desktopsharing.config +++ b/debian/x2goserver-desktopsharing.config @@ -3,35 +3,35 @@ set -e # Source debconf library. -. /usr/share/debconf/confmodule +. '/usr/share/debconf/confmodule' -create_group="false" -if ! getent group "x2godesktopsharing" 1>/dev/null; then - db_input high x2goserver-desktopsharing/create-group-for-sharing || true +create_group='false' +if ! getent 'group' 'x2godesktopsharing' 1>'/dev/null'; then + db_input 'high' 'x2goserver-desktopsharing/create-group-for-sharing' || true db_go - db_get x2goserver-desktopsharing/create-group-for-sharing - create_group=$RET + db_get 'x2goserver-desktopsharing/create-group-for-sharing' + create_group="${RET}" fi -if [ "$create_group" = "true" ]; then - db_set x2goserver-desktopsharing/group-sharing "x2godesktopsharing" +if [ "${create_group}" = 'true' ]; then + db_set 'x2goserver-desktopsharing/group-sharing' 'x2godesktopsharing' else - db_input high x2goserver-desktopsharing/use-existing-group-for-sharing || true + db_input 'high' 'x2goserver-desktopsharing/use-existing-group-for-sharing' || true db_go - db_get x2goserver-desktopsharing/use-existing-group-for-sharing - use_existing_group=$RET + db_get 'x2goserver-desktopsharing/use-existing-group-for-sharing' + use_existing_group="${RET}" - if [ "$use_existing_group" = "true" ]; then - loop=1 - while [ $loop -eq 1 ]; do - db_input high x2goserver-desktopsharing/group-sharing || true + if [ "${use_existing_group}" = 'true' ]; then + loop='1' + while [ "${loop}" -eq '1' ]; do + db_input 'high' 'x2goserver-desktopsharing/group-sharing' || true db_go - db_get x2goserver-desktopsharing/group-sharing - group_sharing=$RET - if getent group $group_sharing 1>/dev/null; then - loop=0 + db_get 'x2goserver-desktopsharing/group-sharing' + group_sharing="${RET}" + if getent 'group' "${group_sharing}" 1>'/dev/null'; then + loop='0' else - db_input critical x2goserver-desktopsharing/no-such-group || true + db_input 'critical' 'x2goserver-desktopsharing/no-such-group' || true db_go continue fi @@ -39,12 +39,12 @@ else fi fi -db_input high x2goserver-desktopsharing/auto-start-on-logon || true +db_input 'high' 'x2goserver-desktopsharing/auto-start-on-logon' || true db_go -db_get x2goserver-desktopsharing/auto-start-on-logon -auto_start=$RET +db_get 'x2goserver-desktopsharing/auto-start-on-logon' +auto_start="${RET}" -if [ "$auto_start" = "true" ]; then - db_input high x2goserver-desktopsharing/auto-activate-on-logon || true +if [ "${auto_start}" = 'true' ]; then + db_input 'high' 'x2goserver-desktopsharing/auto-activate-on-logon' || true db_go fi -- 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 f99c3dfb48ae2b0bf127903996073bf410944101 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 02:56:33 2018 +0100 debian/x2goserver-desktopsharing.postrm: more curly braces, quotes etc. --- debian/changelog | 2 ++ debian/x2goserver-desktopsharing.postrm | 8 +++----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 616a29d..b2a7ef0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + More curly braces, quotes etc. * debian/x2goserver-desktopsharing.config: + More curly braces, quotes etc. + * debian/x2goserver-desktopsharing.postrm: + + More curly braces, quotes etc. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 14 Aug 2018 16:41:40 +0200 diff --git a/debian/x2goserver-desktopsharing.postrm b/debian/x2goserver-desktopsharing.postrm index c3f40e8..6eb1902 100755 --- a/debian/x2goserver-desktopsharing.postrm +++ b/debian/x2goserver-desktopsharing.postrm @@ -17,19 +17,17 @@ set -e # the debian-policy package # Source debconf library. -. /usr/share/debconf/confmodule +. '/usr/share/debconf/confmodule' -db_get x2goserver-desktopsharing/group-sharing -group_sharing=$RET +db_get 'x2goserver-desktopsharing/group-sharing' +group_sharing="${RET}" case "${1}" in 'purge') getent 'group' "${group_sharing}" >'/dev/null' && delgroup "${group_sharing}" ;; - 'remove'|'upgrade'|'failed-upgrade'|'abort-install'|'abort-upgrade'|'disappear') ;; - *) echo "postrm called with unknown argument '${1}'" >&2 exit '1' -- 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 680e3abcf9134c1e5555619bd5b2b00f7331d901 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 02:57:51 2018 +0100 debian/libx2go-server-db-perl.postinst: replace historical "egrep" with "grep -E". --- debian/changelog | 2 ++ debian/libx2go-server-db-perl.postinst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b2a7ef0..28becbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + More curly braces, quotes etc. * debian/x2goserver-desktopsharing.postrm: + More curly braces, quotes etc. + * debian/libx2go-server-db-perl.postinst: + + Replace historical "egrep" with "grep -E". -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 14 Aug 2018 16:41:40 +0200 diff --git a/debian/libx2go-server-db-perl.postinst b/debian/libx2go-server-db-perl.postinst index 13bf0c5..c3425c0 100755 --- a/debian/libx2go-server-db-perl.postinst +++ b/debian/libx2go-server-db-perl.postinst @@ -38,7 +38,7 @@ case "${1}" in # It will only succeed if both packages are installed. As we cannot influence the # installation order, we handle the session DB creation in both packages. One of # them should succeed. - if [ -x '/usr/sbin/x2godbadmin' ] && [ -f '/etc/x2go/x2gosql/sql' ] && egrep '^backend=sqlite.*' '/etc/x2go/x2gosql/sql' 1>'/dev/null'; then + if [ -x '/usr/sbin/x2godbadmin' ] && [ -f '/etc/x2go/x2gosql/sql' ] && grep -E '^backend=sqlite.*' '/etc/x2go/x2gosql/sql' 1>'/dev/null'; then if [ ! -f '/var/lib/x2go/x2go_sessions' ]; then x2godbadmin --createdb else -- 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 e2b3c6c4711729dd075cbae75461cfa1920dfbdc Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 02:58:52 2018 +0100 debian/x2goserver.config: replace historical "egrep" with "grep -E". --- debian/changelog | 2 ++ debian/x2goserver.config | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 28becbf..6a8d713 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + More curly braces, quotes etc. * debian/libx2go-server-db-perl.postinst: + Replace historical "egrep" with "grep -E". + * debian/x2goserver.config: + + Replace historical "egrep" with "grep -E". -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 14 Aug 2018 16:41:40 +0200 diff --git a/debian/x2goserver.config b/debian/x2goserver.config index 0a744ee..ad262bb 100755 --- a/debian/x2goserver.config +++ b/debian/x2goserver.config @@ -9,7 +9,7 @@ LASTVERSION=$2 if dpkg --compare-versions "$LASTVERSION" lt "3.1.0.0" && \ [ -e /etc/x2go/x2gosql/sql ] && \ - egrep "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then + grep -E "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then db_input critical x2goserver/postgresql-upgrade-3_1_0_0 || true db_go @@ -18,9 +18,9 @@ fi if dpkg --compare-versions "$LASTVERSION" lt "4.1.0.0" && \ [ -e /etc/x2go/x2gosql/sql ] && \ - egrep "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then + grep -E "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then db_input critical x2goserver/upgrade-4_1_0_0 || true db_go -fi \ No newline at end of file +fi -- 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 26618f430509b9b1b721c46423cac0493f00b1f3 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:01:06 2018 +0100 debian/x2goserver.config: more curly braces, quotes etc. --- debian/changelog | 1 + debian/x2goserver.config | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a8d713..18304d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,6 +65,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium + Replace historical "egrep" with "grep -E". * debian/x2goserver.config: + Replace historical "egrep" with "grep -E". + + More curly braces, quotes etc. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 14 Aug 2018 16:41:40 +0200 diff --git a/debian/x2goserver.config b/debian/x2goserver.config index ad262bb..72e5bea 100755 --- a/debian/x2goserver.config +++ b/debian/x2goserver.config @@ -3,24 +3,20 @@ set -e # Source debconf library. -. /usr/share/debconf/confmodule +. '/usr/share/debconf/confmodule' -LASTVERSION=$2 +LASTVERSION="${2}" -if dpkg --compare-versions "$LASTVERSION" lt "3.1.0.0" && \ - [ -e /etc/x2go/x2gosql/sql ] && \ - grep -E "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then - - db_input critical x2goserver/postgresql-upgrade-3_1_0_0 || true +if dpkg --compare-versions "${LASTVERSION}" 'lt' '3.1.0.0' && \ + [ -e '/etc/x2go/x2gosql/sql' ] && \ + grep -E '^backend=postgres.*' '/etc/x2go/x2gosql/sql' >'/dev/null'; then + db_input 'critical' 'x2goserver/postgresql-upgrade-3_1_0_0' || true db_go - fi -if dpkg --compare-versions "$LASTVERSION" lt "4.1.0.0" && \ - [ -e /etc/x2go/x2gosql/sql ] && \ - grep -E "^backend=postgres.*" /etc/x2go/x2gosql/sql >/dev/null; then - - db_input critical x2goserver/upgrade-4_1_0_0 || true +if dpkg --compare-versions "${LASTVERSION}" 'lt' '4.1.0.0' && \ + [ -e '/etc/x2go/x2gosql/sql' ] && \ + grep -E '^backend=postgres.*' '/etc/x2go/x2gosql/sql' >'/dev/null'; then + db_input 'critical' 'x2goserver/upgrade-4_1_0_0' || true db_go - fi -- 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 a48603d780a955b1de1e820db0d2c1e1f5804c4f Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:02:46 2018 +0100 x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: replace historical "egrep" with "grep -E". --- debian/changelog | 2 ++ x2goserver-desktopsharing/bin/x2goterminate-desktopsharing | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 18304d7..2f1c30c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -51,6 +51,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium not meant to be executed directly. - libx2go-server-db-perl/Makefile: make sure our {C,LD}FLAGS are always appended to the user-provided ones. + - x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: replace + historical "egrep" with "grep -E". * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing index 59735a0..93f332d 100755 --- a/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing +++ b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing @@ -50,7 +50,7 @@ X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) for process_id in `$PIDOF x2godesktopsharing`; do env_of_process=$(cat -A /proc/$process_id/environ) env_of_process=${env_of_process//^@/\\n} - display=$(echo -e $env_of_process | egrep "^DISPLAY=.*$" | cut -d"=" -f2) + display=$(echo -e $env_of_process | grep -E "^DISPLAY=.*$" | cut -d"=" -f2) if echo $display | grep ":$X2GO_DISPLAY" &>/dev/null; then kill -SIGTERM $process_id exit 0 -- 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 5fa10091e7a1c90608ec39e92653567b001cdc41 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:10:25 2018 +0100 x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: don't use negative exit codes. --- debian/changelog | 2 ++ x2goserver-desktopsharing/bin/x2goterminate-desktopsharing | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2f1c30c..3e522be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -53,6 +53,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium appended to the user-provided ones. - x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: replace historical "egrep" with "grep -E". + - x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: don't use + negative exit codes. * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing index 93f332d..43455a0 100755 --- a/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing +++ b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing @@ -57,4 +57,4 @@ for process_id in `$PIDOF x2godesktopsharing`; do fi done -exit -1 +exit '1' -- 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 621f47df44a7296dcbe1ba4cd268a382594ced84 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:11:05 2018 +0100 x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: more curly braces, quotes etc. --- debian/changelog | 2 + .../bin/x2goterminate-desktopsharing | 46 +++++++++++----------- 2 files changed, 25 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3e522be..5da383f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -55,6 +55,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium historical "egrep" with "grep -E". - x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: don't use negative exit codes. + - x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: more curly + braces, quotes etc. * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing index 43455a0..51b5b1a 100755 --- a/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing +++ b/x2goserver-desktopsharing/bin/x2goterminate-desktopsharing @@ -21,39 +21,39 @@ # Copyright (C) 2011-2015 Heinz-Markus Graesing <heinz-m.graesing@obviously-nice.de> # Copyright (C) 2011-2015 Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -if [ $# -eq 1 ]; then - SESSION_NAME=$1 +if [ "${#}" -eq '1' ]; then + SESSION_NAME="${1}" else - SESSION_NAME=$X2GO_SESSION + SESSION_NAME="${X2GO_SESSION}" fi -X2GO_LIB_PATH=`x2gopath libexec` +X2GO_LIB_PATH="$(x2gopath 'libexec')" -if type -p pidof 1>/dev/null 2>/dev/null; then - PIDOF=pidof -elif [ -x /usr/local/sbin/pidof ]; then - PIDOF=/usr/local/sbin/pidof -elif [ -x /usr/sbin/pidof ]; then - PIDOF=/usr/sbin/pidof -elif [ -x /sbin/pidof ]; then - PIDOF=/sbin/pidof +if type -p 'pidof' 1>'/dev/null' 2>'/dev/null'; then + PIDOF='pidof' +elif [ -x '/usr/local/sbin/pidof' ]; then + PIDOF='/usr/local/sbin/pidof' +elif [ -x '/usr/sbin/pidof' ]; then + PIDOF='/usr/sbin/pidof' +elif [ -x '/sbin/pidof' ]; then + PIDOF='/sbin/pidof' else # no pidof utility found, get out the big hammer!!! - killall x2godesktopsharing - exit 0 + killall 'x2godesktopsharing' + exit '0' fi -$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" +"${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'info' "$(basename "${0}") called with options: ${@}" -X2GO_DISPLAY=$(echo $SESSION_NAME | cut -d"-" -f2) -for process_id in `$PIDOF x2godesktopsharing`; do - env_of_process=$(cat -A /proc/$process_id/environ) - env_of_process=${env_of_process//^@/\\n} - display=$(echo -e $env_of_process | grep -E "^DISPLAY=.*$" | cut -d"=" -f2) - if echo $display | grep ":$X2GO_DISPLAY" &>/dev/null; then - kill -SIGTERM $process_id - exit 0 +X2GO_DISPLAY="$(echo "${SESSION_NAME}" | cut -d '-' -f '2')" +for process_id in $("${PIDOF}" 'x2godesktopsharing'); do + env_of_process="$(cat -A "/proc/${process_id}/environ")" + env_of_process="${env_of_process//^@/\\n}" + display="$(echo -e "${env_of_process}" | grep -E '^DISPLAY=.*$' | cut -d '=' -f '2')" + if echo "${display}" | grep ":${X2GO_DISPLAY}" &>'/dev/null'; then + kill -SIGTERM "${process_id}" + exit '0' fi done -- 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 80349bd3438ecf22549bca7e70353252a40ca47b Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:12:16 2018 +0100 x2goserver-extensions/bin/x2goserver-run-extensions: replace historical "egrep" with "grep -E". --- debian/changelog | 2 ++ x2goserver-extensions/bin/x2goserver-run-extensions | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5da383f..fb4c1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium negative exit codes. - x2goserver-desktopsharing/bin/x2goterminate-desktopsharing: more curly braces, quotes etc. + - x2goserver-extensions/bin/x2goserver-run-extensions: replace historical + "egrep" with "grep -E". * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 9a56bcc..8807173 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -32,7 +32,7 @@ X2GO_SESSION="$1" X2GO_MODALITY="$2" # scan extensions and execute them -find "$X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/" -maxdepth 1 -mindepth 1 | egrep "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do +find "$X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/" -maxdepth 1 -mindepth 1 | grep -E "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" $x2go_extension "$X2GO_SESSION" &>/dev/null && { $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension ($(basename $0)) for session $X2GO_SESSION has finished sucessfully" -- 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 a9c40062b341b4824cb3262a295b89f922fdcfdd Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:13:27 2018 +0100 x2goserver-extensions/bin/x2goserver-run-extensions: don't use negative exit codes. --- debian/changelog | 2 ++ x2goserver-extensions/bin/x2goserver-run-extensions | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fb4c1fb..ac0a27e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,6 +59,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium braces, quotes etc. - x2goserver-extensions/bin/x2goserver-run-extensions: replace historical "egrep" with "grep -E". + - x2goserver-extensions/bin/x2goserver-run-extensions: don't use negative + exit codes. * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 8807173..5d81eca 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -22,7 +22,7 @@ set -e -test -z $2 && { echo "usage: $(basename $0) <X2GO_SESSION_ID> <MODALITY>"; exit -1; } +test -z $2 && { echo "usage: $(basename $0) <X2GO_SESSION_ID> <MODALITY>"; exit 1; } X2GO_LIB_PATH="$(x2gopath libexec)"; -- 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 82d1e412cb1cf5673c56e802321981d363ea8585 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:17:36 2018 +0100 x2goserver-extensions/bin/x2goserver-run-extensions: more curly braces, quotes etc. --- debian/changelog | 2 ++ .../bin/x2goserver-run-extensions | 25 ++++++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index ac0a27e..3e5f45f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,6 +61,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium "egrep" with "grep -E". - x2goserver-extensions/bin/x2goserver-run-extensions: don't use negative exit codes. + - x2goserver-extensions/bin/x2goserver-run-extensions: more curly braces, + quotes etc. * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver-extensions/bin/x2goserver-run-extensions b/x2goserver-extensions/bin/x2goserver-run-extensions index 5d81eca..e22a333 100755 --- a/x2goserver-extensions/bin/x2goserver-run-extensions +++ b/x2goserver-extensions/bin/x2goserver-run-extensions @@ -22,23 +22,26 @@ set -e -test -z $2 && { echo "usage: $(basename $0) <X2GO_SESSION_ID> <MODALITY>"; exit 1; } +test -z "${2}" && { + echo "Usage: $(basename "${0}") <X2GO_SESSION_ID> <MODALITY>" + exit '1' +} -X2GO_LIB_PATH="$(x2gopath libexec)"; +X2GO_LIB_PATH="$(x2gopath 'libexec')" -$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" +"${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'info' "$(basename "${0}") called with options: ${@}" -X2GO_SESSION="$1" -X2GO_MODALITY="$2" +X2GO_SESSION="${1}" +X2GO_MODALITY="${2}" # scan extensions and execute them -find "$X2GO_LIB_PATH/extensions/$X2GO_MODALITY.d/" -maxdepth 1 -mindepth 1 | grep -E "/[0-9]{3}_[[:alnum:]]+" | sort | while read x2go_extension; do - $X2GO_LIB_PATH/x2gosyslog "$0" "debug" "executing $x2go_extension with option $X2GO_SESSION" - $x2go_extension "$X2GO_SESSION" &>/dev/null && { - $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$x2go_extension ($(basename $0)) for session $X2GO_SESSION has finished sucessfully" +find "${X2GO_LIB_PATH}/extensions/${X2GO_MODALITY}.d/" -maxdepth '1' -mindepth '1' | grep -E '/[0-9]{3}_[[:alnum:]]+' | sort | while read 'x2go_extension'; do + "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'debug' "executing ${x2go_extension} with option ${X2GO_SESSION}" + "${x2go_extension}" "${X2GO_SESSION}" &>'/dev/null' && { + "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'info' "${x2go_extension} ($(basename "${0}")) for session ${X2GO_SESSION} has finished sucessfully" } || { - $X2GO_LIB_PATH/x2gosyslog "$0" "warning" "$x2go_extension ($(basename $0)) for session $X2GO_SESSION returned a non-zero exit code, continuing..." + "${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'warning' "${x2go_extension} ($(basename "${0}")) for session ${X2GO_SESSION} returned a non-zero exit code, continuing..." } done -exit 0 +exit '0' -- 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 3a99607e550b4a92371bef402983a4d6283cc2ac Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:28:54 2018 +0100 x2goserver/bin/x2gofeaturelist: replace historical "egrep" with "grep -E". --- debian/changelog | 2 ++ x2goserver/bin/x2gofeaturelist | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3e5f45f..76c1305 100644 --- a/debian/changelog +++ b/debian/changelog @@ -63,6 +63,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium exit codes. - x2goserver-extensions/bin/x2goserver-run-extensions: more curly braces, quotes etc. + - x2goserver/bin/x2gofeaturelist: replace historical "egrep" with "grep + -E". * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver/bin/x2gofeaturelist b/x2goserver/bin/x2gofeaturelist index b3d3add..259ad46 100755 --- a/x2goserver/bin/x2gofeaturelist +++ b/x2goserver/bin/x2gofeaturelist @@ -26,6 +26,6 @@ X2GO_SHARE_PATH="$(x2gopath share)"; # run x2gofeature scripts of X2Go extensions test -d "$X2GO_SHARE_PATH/x2gofeature.d" && { for subscript in "$X2GO_SHARE_PATH/x2gofeature.d/"*.features; do - cat "$subscript" | egrep ".*\).*ok.*exit 0.*" | cut -d"\"" -f2 | cut -d"\"" -f1 + cat "$subscript" | grep -E ".*\).*ok.*exit 0.*" | cut -d"\"" -f2 | cut -d"\"" -f1 done } -- 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 865d66b7b72d7785bd201a26f99140d9e59e64e2 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:32:00 2018 +0100 x2goserver/bin/x2gofeaturelist: more curly braces, quotes etc. --- debian/changelog | 1 + x2goserver/bin/x2gofeaturelist | 14 +++++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 76c1305..98f889a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -65,6 +65,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium quotes etc. - x2goserver/bin/x2gofeaturelist: replace historical "egrep" with "grep -E". + - x2goserver/bin/x2gofeaturelist: more curly braces, quotes etc. * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver/bin/x2gofeaturelist b/x2goserver/bin/x2gofeaturelist index 259ad46..ed373e8 100755 --- a/x2goserver/bin/x2gofeaturelist +++ b/x2goserver/bin/x2gofeaturelist @@ -18,14 +18,14 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -X2GO_LIB_PATH="$(x2gopath libexec)"; -X2GO_SHARE_PATH="$(x2gopath share)"; +X2GO_LIB_PATH="$(x2gopath 'libexec')" +X2GO_SHARE_PATH="$(x2gopath 'share')" -"$X2GO_LIB_PATH/x2gosyslog" "$0" "info" "$(basename $0) called with options: $@" +"${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'info' "$(basename "${0}") called with options: ${@}" # run x2gofeature scripts of X2Go extensions -test -d "$X2GO_SHARE_PATH/x2gofeature.d" && { - for subscript in "$X2GO_SHARE_PATH/x2gofeature.d/"*.features; do - cat "$subscript" | grep -E ".*\).*ok.*exit 0.*" | cut -d"\"" -f2 | cut -d"\"" -f1 - done +test -d "${X2GO_SHARE_PATH}/x2gofeature.d" && { + for subscript in "${X2GO_SHARE_PATH}/x2gofeature.d/"*.features; do + cat "${subscript}" | grep -E '.*\).*ok.*exit 0.*' | cut -d '"' -f '2' | cut -d '"' -f '1' + done } -- 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 27382e83826c2dd75c34a954545b06444354a622 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:33:59 2018 +0100 x2goserver/bin/x2goruncommand: replace historical "egrep" with "grep -E". --- debian/changelog | 2 ++ x2goserver/bin/x2goruncommand | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 98f889a..31c83a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,8 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium - x2goserver/bin/x2gofeaturelist: replace historical "egrep" with "grep -E". - x2goserver/bin/x2gofeaturelist: more curly braces, quotes etc. + - x2goserver/bin/x2goruncommand: replace historical "egrep" with "grep + -E". * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand index 2d8f23e..b55aa97 100755 --- a/x2goserver/bin/x2goruncommand +++ b/x2goserver/bin/x2goruncommand @@ -194,7 +194,7 @@ if [ "$cmd" == "GNOME" ] || [ "$cmd" == "gnome-session" ]; then args=" --session=$DESKTOP_SESSION" elif [ "$DISTRIB_ID" == "Ubuntu" ] && [ "$(echo "$DISTRIB_RELEASE <= 10.10" | bc)" == "1" ]; then export DESKTOP_SESSION="gnome" - elif cat /etc/debian_version | egrep "^(squeeze|6\.).*" >/dev/null; then + elif grep -E '^(squeeze|6\.).*' '/etc/debian_version' >'/dev/null'; then export DESKTOP_SESSION="gnome" fi -- 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 26a3e5436e13eb955ab0a032fb4a7e2ebcebdc7b Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:38:48 2018 +0100 x2goserver/bin/x2goversion: more curly braces, quotes etc. --- debian/changelog | 1 + x2goserver/bin/x2goversion | 28 +++++++++++++++------------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index b7fcabb..88ad5c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium - x2goserver/bin/x2goruncommand: replace historical "egrep" with "grep -E". - x2goserver/bin/x2goversion: replace historical "egrep" with "grep -E". + - x2goserver/bin/x2goversion: more curly braces, quotes etc. * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index 35f012d..fbe76f4 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -19,32 +19,34 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -X2GO_LIB_PATH="$(x2gopath libexec)"; +X2GO_LIB_PATH="$(x2gopath 'libexec')" -$X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" +"${X2GO_LIB_PATH}/x2gosyslog" "${0}" 'info' "$(basename "${0}") called with options: ${@}" -X2GO_VERSIONS_BASEPATH="$(dirname $0)/../share/x2go/versions" +X2GO_VERSIONS_BASEPATH="$(dirname "${0}")/../share/x2go/versions" get_version() { - cat "$1" | grep -Ev "^#.*" | head -n1 | cut -d" " -f1 + grep -Ev "^#.*" "${1}" | head -n '1' | cut -d ' ' -f '1' } -if [ -n "$1" ]; then - X2GO_COMPONENT="$1" +if [ -n "${1}" ]; then + X2GO_COMPONENT="${1}" X2GO_COMPONENT_VERFILE="${X2GO_VERSIONS_BASEPATH}/VERSION.${X2GO_COMPONENT}" if [ -f "${X2GO_COMPONENT_VERFILE}" ]; then - echo "$(get_version ${X2GO_COMPONENT_VERFILE})" + echo "$(get_version "${X2GO_COMPONENT_VERFILE}")" else - echo "Version information for X2Go component '$X2GO_COMPONENT' is not available." >&1 - exit 1 + echo "Version information for X2Go component '${X2GO_COMPONENT}' is not available." >&1 + exit '1' fi else cd "${X2GO_VERSIONS_BASEPATH}" - for compfile in `ls "${X2GO_VERSIONS_BASEPATH}"`; do - X2GO_COMPONENT="$(echo $compfile | cut -d"." -f2)" - X2GO_COMPONENT_VERSION="$(get_version $compfile)" + for compfile in "${X2GO_VERSIONS_BASEPATH}"/*; do + X2GO_COMPONENT="$(echo "${compfile}" | cut -d '.' -f '2')" + X2GO_COMPONENT_VERSION="$(get_version "${compfile}")" echo "${X2GO_COMPONENT}: ${X2GO_COMPONENT_VERSION}" done - cd - >/dev/null + cd '-' >'/dev/null' fi + +exit '0' -- 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 26729b6871bcefb1cacc080560691d7abd2c9250 Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Nov 16 03:35:03 2018 +0100 x2goserver/bin/x2goversion: replace historical "egrep" with "grep -E". --- debian/changelog | 1 + x2goserver/bin/x2goversion | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 31c83a6..b7fcabb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -68,6 +68,7 @@ x2goserver (4.1.0.3-0x2go1) UNRELEASED; urgency=medium - x2goserver/bin/x2gofeaturelist: more curly braces, quotes etc. - x2goserver/bin/x2goruncommand: replace historical "egrep" with "grep -E". + - x2goserver/bin/x2goversion: replace historical "egrep" with "grep -E". * x2goserver.spec: + Pull in openSUSE-release manually on OpenSuSE Tumbleweed to work around a bug. diff --git a/x2goserver/bin/x2goversion b/x2goserver/bin/x2goversion index 45d6525..35f012d 100755 --- a/x2goserver/bin/x2goversion +++ b/x2goserver/bin/x2goversion @@ -26,7 +26,7 @@ $X2GO_LIB_PATH/x2gosyslog "$0" "info" "$(basename $0) called with options: $@" X2GO_VERSIONS_BASEPATH="$(dirname $0)/../share/x2go/versions" get_version() { - cat "$1" | egrep -v "^#.*" | head -n1 | cut -d" " -f1 + cat "$1" | grep -Ev "^#.*" | head -n1 | cut -d" " -f1 } if [ -n "$1" ]; then -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
-
git-admin＠x2go.org