[X2Go-Commits] [x2goserver] 12/17: x2goserver-extensions/bin/x2goserver-run-extensions: more curly braces, quotes etc.

[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 82d1e412cb1cf5673c56e802321981d363ea8585
Author: Mihai Moldovan <ionic at 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