Skip to content

Commit 4b206d6

Browse files
committed
bash: use modern syntax for command substitution
Replace `cmd` with $(cmd).
1 parent 7e3da42 commit 4b206d6

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,6 @@ src/version.cc:
6868
cmd='basename $$(readlink -f .) | cut -f2 -d-'; \
6969
fi \
7070
&& printf "#include \"version.hh\"\nconst char *CS_VERSION = \"%s\";\n" \
71-
"`eval "$$cmd"`" > $@.tmp \
71+
"$$(eval "$$cmd")" > $@.tmp \
7272
&& install -m0644 -C -v $@.tmp $@ \
7373
&& rm -f $@.tmp

make-srpm.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,31 +30,31 @@ match() {
3030
grep "$@" > /dev/null
3131
}
3232

33-
DST="`readlink -f "$PWD"`"
33+
DST="$(readlink -f "$PWD")"
3434

35-
REPO="`git rev-parse --show-toplevel`"
35+
REPO="$(git rev-parse --show-toplevel)"
3636
test -d "$REPO" || die "not in a git repo"
3737

38-
NV="`git describe --tags`"
38+
NV="$(git describe --tags)"
3939
echo "$NV" | match "^$PKG-" || die "release tag not found"
4040

41-
VER="`echo "$NV" | sed "s/^$PKG-//"`"
41+
VER="$(echo "$NV" | sed "s/^$PKG-//")"
4242

43-
TIMESTAMP="`git log --pretty="%cd" --date=iso -1 \
44-
| tr -d ':-' | tr ' ' . | cut -d. -f 1,2`"
43+
TIMESTAMP="$(git log --pretty="%cd" --date=iso -1 \
44+
| tr -d ':-' | tr ' ' . | cut -d. -f 1,2)"
4545

46-
VER="`echo "$VER" | sed "s/-.*-/.$TIMESTAMP./"`"
46+
VER="$(echo "$VER" | sed "s/-.*-/.$TIMESTAMP./")"
4747

48-
BRANCH="`git rev-parse --abbrev-ref HEAD`"
48+
BRANCH="$(git rev-parse --abbrev-ref HEAD)"
4949
test -n "$BRANCH" || die "failed to get current branch name"
5050
test "main" = "${BRANCH}" || VER="${VER}.${BRANCH//[\/-]/_}"
51-
test -z "`git diff HEAD`" || VER="${VER}.dirty"
51+
test -z "$(git diff HEAD)" || VER="${VER}.dirty"
5252

5353
NV="${PKG}-${VER}"
5454
printf "\n%s: preparing a release of \033[1;32m%s\033[0m\n\n" "$SELF" "$NV"
5555

5656
if [[ "$1" != "--generate-spec" ]]; then
57-
TMP="`mktemp -d`"
57+
TMP="$(mktemp -d)"
5858
trap "rm -rf '$TMP'" EXIT
5959
cd "$TMP" >/dev/null || die "mktemp failed"
6060

tests/cssort/sync-diff.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#!/bin/sh
2-
export CSSORT="`readlink -f ../../csdiff_build/src/cssort`"
2+
export CSSORT="$(readlink -f ../../csdiff_build/src/cssort)"
33

44
for dir in cssort*/; do (
55
cd $dir || exit $?
66
for input in ??-input.err; do
7-
bare_input=`basename $input -input.err`
7+
bare_input=$(basename $input -input.err)
88
set -x
99
"$CSSORT" --key=checker ${input} 2>/dev/null > ${bare_input}-by-checker.err
1010
"$CSSORT" --key=path ${input} 2>/dev/null > ${bare_input}-by-path.err

0 commit comments

Comments
 (0)