diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-02-03 14:53:40 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-02-03 14:53:40 +0100 |
commit | 3e02494cbc29d2a40b377cc803eae3eb50911e11 (patch) | |
tree | 6c35a90f2e1b6715af66458127217d2e97ffd16f /nx-X11 | |
parent | f696a57f8f17b87deca8079ac9a71d184bfedb53 (diff) | |
parent | 9d0364198e1e161e540e05757f40935f7018d8d6 (diff) | |
download | nx-libs-3e02494cbc29d2a40b377cc803eae3eb50911e11.tar.gz nx-libs-3e02494cbc29d2a40b377cc803eae3eb50911e11.tar.bz2 nx-libs-3e02494cbc29d2a40b377cc803eae3eb50911e11.zip |
Merge branch 'mjtrangoni-fix-shellcheck-issues' into 3.6.x
Attributes GH PR #996: https://github.com/ArcticaProject/nx-libs/pull/996
Diffstat (limited to 'nx-X11')
-rw-r--r-- | nx-X11/lib/src/util/mkks.sh | 4 | ||||
-rwxr-xr-x | nx-X11/x-indent-all.sh | 2 | ||||
-rwxr-xr-x | nx-X11/x-indent.sh | 2 |
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 |