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