Merge branch 'mjtrangoni-fix-shellcheck-issues' into 3.6.x

Attributes GH PR #996: https://github.com/ArcticaProject/nx-libs/pull/996

3 files changed, 4 insertions, 4 deletions

diff --git a/nx-X11/lib/src/util/mkks.sh b/nx-X11/lib/src/util/mkks.sh
index ab5ca80c9..7af0e51ab 100644
--- a/nx-X11/lib/src/util/mkks.sh
+++ b/nx-X11/lib/src/util/mkks.sh
@@ -1,10 +1,10 @@
 #!/bin/sh
 
-cat $* | awk 'BEGIN { \
+awk 'BEGIN { \
     printf "/*\n * This file is generated from %s.  Do not edit.\n */\n", \
 	   "$(INCLUDESRC)/keysymdef.h";\
 } \
 /^#define/ { \
 	len = length($2)-3; \
 	printf("{ \"%s\", %s },\n", substr($2,4,len), $3); \
-}'
+}' "$@"
diff --git a/nx-X11/x-indent-all.sh b/nx-X11/x-indent-all.sh
index 6addaf400..d3c4113de 100755
--- a/nx-X11/x-indent-all.sh
+++ b/nx-X11/x-indent-all.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
-where=`dirname $0`
+where=$(dirname $0)
 git ls-files | grep '\.[chm]$' | xargs sh "$where"/x-indent.sh
 
diff --git a/nx-X11/x-indent.sh b/nx-X11/x-indent.sh
index e662cce09..327aa6a4f 100755
--- a/nx-X11/x-indent.sh
+++ b/nx-X11/x-indent.sh
@@ -2,7 +2,7 @@
 
 # We want GNU indent, so first search for gindent to avoid /usr/bin/indent
 # on the BSDs, which won't work for us
-INDENT=`which gnuindent || which gindent || which indent`
+INDENT=$(which gnuindent || which gindent || which indent)
 
 if [ -z "${INDENT}" ] ; then
     echo "Could not find indent, sorry..." >&2