Skip to content
Snippets Groups Projects
Commit cf410392 authored by Thomas Jahns's avatar Thomas Jahns :cartwheel:
Browse files

release script: Adjust quoting for shellcheck.

parent 29835b6f
No related branches found
No related tags found
No related merge requests found
......@@ -113,7 +113,7 @@ if [[ -z "${MAKE+set}" ]]; then
MAKE=$(sed -n -e '/^MAKE = /{
s/^MAKE =[ ]*\(.*[^ ]\) *$/\1/; p ; q
}' Makefile)
[[ -n "${MAKE}" ]] || MAKE=make
[[ -n "${MAKE}" ]] || MAKE='make'
fi
echo " ${MAKE}"
${MAKE} -j >&6 2>&6
......
......@@ -37,7 +37,7 @@ errMsg()
pfx=${cmd:ofs}; vpos=${vpos%%\$*}; ofs=$((ofs+${#vpos}))
cmd=${cmd/\$\{${BASH_REMATCH[1]}\}/${!BASH_REMATCH[1]}}
done
printf "error: failed to run command\n%s\nat %s, line %d!\n" "$cmd" \
printf 'error: failed to run command\n%s\nat %s, line %d!\n' "$cmd" \
"${BASH_SOURCE[$src_lev-2]}" "${BASH_LINENO[$src_lev-2]}" >&2
}
trap errMsg ERR
......@@ -64,7 +64,7 @@ fi
SRC_DIR=$PWD
cd "${BUILD_DIR}"
for ((i=0; i < 2; ++i)); do
args=(--prefix="${BUILD_DIR}-install")
args=("--prefix=${BUILD_DIR}-install")
if ((i == 0)); then
args+=(--enable-maintainer-mode)
fi
......@@ -78,7 +78,7 @@ s/^PACKAGE_VERSION =[ ]*\(.*[^ ]\) *$/\1/; p ; q
MAKE=$(sed -n -e '/^MAKE = /{
s/^MAKE =[ ]*\(.*[^ ]\) *$/\1/; p ; q
}' Makefile)
[[ -n "${MAKE}" ]] || MAKE=make
[[ -n "${MAKE}" ]] || MAKE='make'
fi
if [[ "$mf_version" != "$version" ]]; then
echo "error: versions from Makefile ($mf_version) and configure.ac" \
......
......@@ -46,7 +46,7 @@ errMsg()
pfx=${cmd:ofs}; vpos=${vpos%%\$*}; ofs=$((ofs+${#vpos}))
cmd=${cmd/\$\{${BASH_REMATCH[1]}\}/${!BASH_REMATCH[1]}}
done
printf "error: failed to run command\n%s\nat %s, line %d!\n" "$cmd" \
printf 'error: failed to run command\n%s\nat %s, line %d!\n' "$cmd" \
"${BASH_SOURCE[$src_lev-2]}" "${BASH_LINENO[$src_lev-2]}" >&2
}
trap errMsg ERR
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment