lint: Fix shell lints

This commit is contained in:
Jack Grigg 2022-08-19 22:40:02 +00:00
parent 9657f410ed
commit 1f94372b86
12 changed files with 29 additions and 27 deletions

View File

@ -14,8 +14,8 @@ ZCASHTX=${ZCASHTX:-$SRCDIR/zcash-tx}
# The autodetected version git tag can screw up manpage output a little bit # The autodetected version git tag can screw up manpage output a little bit
read -r -a ZECVERSTR <<< "$($ZCASHCLI --version | head -n1 | awk '{ print $NF }')" read -r -a ZECVERSTR <<< "$($ZCASHCLI --version | head -n1 | awk '{ print $NF }')"
read -r -a ZECVER <<< "$(echo $ZECVERSTR | awk -F- '{ OFS="-"; NF--; print $0; }')" read -r -a ZECVER <<< "$(echo ${ZECVERSTR[0]} | awk -F- '{ OFS="-"; NF--; print $0; }')"
read -r -a ZECCOMMIT <<< "$(echo $ZECVERSTR | awk -F- '{ print $NF }')" read -r -a ZECCOMMIT <<< "$(echo ${ZECVERSTR[0]} | awk -F- '{ print $NF }')"
# Create a footer file with copyright content. # Create a footer file with copyright content.
# This gets autodetected fine for zcashd if --version-string is not set, # This gets autodetected fine for zcashd if --version-string is not set,
@ -26,14 +26,14 @@ grep -v "Bitcoin Core Developers" footer.h2m >footer-no-bitcoin-copyright.h2m
for cmd in $ZCASHD $ZCASHCLI $ZCASHTX; do for cmd in $ZCASHD $ZCASHCLI $ZCASHTX; do
cmdname="${cmd##*/}" cmdname="${cmd##*/}"
help2man -N --version-string=$ZECVER --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} help2man -N --version-string=${ZECVER[0]} --include=footer.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
sed -i "s/\\\-$ZECCOMMIT//g" ${MANDIR}/${cmdname}.1 sed -i "s/\\\-${ZECCOMMIT[0]}//g" ${MANDIR}/${cmdname}.1
done done
for cmd in $ZCASHD_WALLET_TOOL; do for cmd in $ZCASHD_WALLET_TOOL; do
cmdname="${cmd##*/}" cmdname="${cmd##*/}"
help2man -N --version-string=$ZECVER --include=footer-no-bitcoin-copyright.h2m -o ${MANDIR}/${cmdname}.1 ${cmd} help2man -N --version-string=${ZECVER[0]} --include=footer-no-bitcoin-copyright.h2m -o ${MANDIR}/${cmdname}.1 ${cmd}
sed -i "s/\\\-$ZECCOMMIT//g" ${MANDIR}/${cmdname}.1 sed -i "s/\\\-${ZECCOMMIT[0]}//g" ${MANDIR}/${cmdname}.1
done done
rm -f footer.h2m rm -f footer.h2m

View File

@ -7,9 +7,8 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
CLANG_PACKAGE="$SCRIPT_DIR/../../depends/packages/native_clang.mk" CLANG_PACKAGE="$SCRIPT_DIR/../../depends/packages/native_clang.mk"
LIBCXX_PACKAGE="$SCRIPT_DIR/../../depends/packages/libcxx.mk" LIBCXX_PACKAGE="$SCRIPT_DIR/../../depends/packages/libcxx.mk"
CLANG_MAJOR_VERSION=$( cat $CLANG_PACKAGE | grep -oP "_major_version=\K.*" ) CLANG_VERSION=$( grep -v _major_version $CLANG_PACKAGE | grep -oP "_version=\K.*" )
CLANG_VERSION=$( cat $CLANG_PACKAGE | grep -v _major_version | grep -oP "_version=\K.*" ) LIBCXX_MSYS2_VERSION=$( grep -oP "_msys2_version=\K.*" $LIBCXX_PACKAGE )
LIBCXX_MSYS2_VERSION=$( cat $LIBCXX_PACKAGE | grep -oP "_msys2_version=\K.*" )
update_clang_hash() { update_clang_hash() {
url="https://github.com/llvm/llvm-project/releases/download/llvmorg-$CLANG_VERSION/clang+llvm-$CLANG_VERSION-$1.tar.xz" url="https://github.com/llvm/llvm-project/releases/download/llvmorg-$CLANG_VERSION/clang+llvm-$CLANG_VERSION-$1.tar.xz"

View File

@ -5,7 +5,7 @@ export LC_ALL=C
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
RUST_PACKAGE="$SCRIPT_DIR/../../depends/packages/native_rust.mk" RUST_PACKAGE="$SCRIPT_DIR/../../depends/packages/native_rust.mk"
RUST_VERSION=$( cat $RUST_PACKAGE | grep -oP "_version=\K.*" ) RUST_VERSION=$( grep -oP "_version=\K.*" $RUST_PACKAGE )
update_hash() { update_hash() {
url="https://static.rust-lang.org/dist/$1-$RUST_VERSION-$2.tar.gz" url="https://static.rust-lang.org/dist/$1-$RUST_VERSION-$2.tar.gz"

View File

@ -13,7 +13,7 @@ CARGO_TOML="$REPOBASE/Cargo.toml"
CONFIG_FILE="$REPOBASE/.cargo/config.offline" CONFIG_FILE="$REPOBASE/.cargo/config.offline"
CARGO_TOML_PATCH_PREFIX="[patch.crates-io]" CARGO_TOML_PATCH_PREFIX="[patch.crates-io]"
let CARGO_TOML_PATCH_START=$(grep -Fn "$CARGO_TOML_PATCH_PREFIX" $CARGO_TOML | cut -d: -f1)+1 (( CARGO_TOML_PATCH_START=$(grep -Fn "$CARGO_TOML_PATCH_PREFIX" $CARGO_TOML | cut -d: -f1)+1 ))
if [ "$CARGO_TOML_PATCH_START" -eq 1 ]; then if [ "$CARGO_TOML_PATCH_START" -eq 1 ]; then
# We have no patched dependencies to lint. # We have no patched dependencies to lint.
exit exit

View File

@ -6,7 +6,8 @@ set -eu -o pipefail
AFL_HARDEN=1 AFL_HARDEN=1
CONFIGURE_FLAGS="--enable-tests=no --enable-fuzz-main" CONFIGURE_FLAGS="--enable-tests=no --enable-fuzz-main"
ZCUTIL=$(realpath "./zcutil") ZCUTIL=$(realpath "./zcutil")
export AFL_LOG_DIR="$(pwd)" AFL_LOG_DIR="$(pwd)"
export AFL_LOG_DIR
for d in src/fuzzing/*/ ; do for d in src/fuzzing/*/ ; do
fuzz_cases+="$(basename "$d"), " fuzz_cases+="$(basename "$d"), "
@ -79,7 +80,7 @@ while (( "$#" )); do
ZCUTIL=$(realpath "$2") ZCUTIL=$(realpath "$2")
shift 2 shift 2
;; ;;
-*|--*=) -?|--*=)
echo "Error: Unsupported flag $1" >&2 echo "Error: Unsupported flag $1" >&2
help help
exit 1 exit 1

View File

@ -39,7 +39,7 @@ while (( "$#" )); do
help help
exit 0 exit 0
;; ;;
-*|--*=) -?|--*=)
echo "Error: Unsupported flag $1" >&2 echo "Error: Unsupported flag $1" >&2
help help
exit 1 exit 1

View File

@ -11,7 +11,8 @@ FUZZ_OPTIONS_STRING="Options are: ${fuzz_cases::-2}"
required_options_count=0 required_options_count=0
export AFL_INSTALL_DIR=$(realpath "./afl-temp") AFL_INSTALL_DIR=$(realpath "./afl-temp")
export AFL_INSTALL_DIR
function help { function help {
cat <<EOF cat <<EOF
@ -47,7 +48,7 @@ while (( "$#" )); do
help help
exit 0 exit 0
;; ;;
-*|--*=) -?|--*=)
echo "Error: Unsupported flag $1" >&2 echo "Error: Unsupported flag $1" >&2
help help
exit 1 exit 1

View File

@ -46,7 +46,7 @@ while (( "$#" )); do
help help
exit 0 exit 0
;; ;;
-*|--*=) -?|--*=)
echo "Error: Unsupported flag $1" >&2 echo "Error: Unsupported flag $1" >&2
help help
exit 1 exit 1

View File

@ -23,7 +23,7 @@ cd "$(dirname "$("$READLINK" -f "$0")")/.."
# Allow user overrides to $MAKE. Typical usage for users who need it: # Allow user overrides to $MAKE. Typical usage for users who need it:
# MAKE=gmake ./zcutil/build.sh -j$(nproc) # MAKE=gmake ./zcutil/build.sh -j$(nproc)
if [ -z "${MAKE-}" ]; then if [ -z "${MAKE-}" ]; then
MAKE=make MAKE="make"
fi fi
# Allow overrides to $BUILD and $HOST for porters. Most users will not need it. # Allow overrides to $BUILD and $HOST for porters. Most users will not need it.

View File

@ -20,7 +20,7 @@ for nonzctag in $(git ls-remote origin \
) )
do do
git push origin ":refs/tags/${nonzctag}" & git push origin ":refs/tags/${nonzctag}" &
i="$(expr "$i" + 1)" i=$((i + 1))
[ "$i" -ge "$MAXJOBS" ] && wait -n [ "$i" -ge "$MAXJOBS" ] && wait -n
done done

View File

@ -35,7 +35,7 @@ ZC_DISABLE_CURL="${ZC_DISABLE_CURL:-}"
LOCKFILE=/tmp/fetch_params.lock LOCKFILE=/tmp/fetch_params.lock
fetch_wget() { fetch_wget() {
if [ -z "$WGETCMD" ] || ! [ -z "$ZC_DISABLE_WGET" ]; then if [ -z "$WGETCMD" ] || [ -n "$ZC_DISABLE_WGET" ]; then
return 1 return 1
fi fi
@ -53,7 +53,7 @@ EOF
} }
fetch_ipfs() { fetch_ipfs() {
if [ -z "$IPFSCMD" ] || ! [ -z "$ZC_DISABLE_IPFS" ]; then if [ -z "$IPFSCMD" ] || [ -n "$ZC_DISABLE_IPFS" ]; then
return 1 return 1
fi fi
@ -66,7 +66,7 @@ EOF
} }
fetch_curl() { fetch_curl() {
if [ -z "$CURLCMD" ] || ! [ -z "$ZC_DISABLE_CURL" ]; then if [ -z "$CURLCMD" ] || [ -n "$ZC_DISABLE_CURL" ]; then
return 1 return 1
fi fi

View File

@ -22,12 +22,12 @@ usage() {
echo "Where fuzzer is an entry in ./src/fuzzing/*, the default sanitizer" echo "Where fuzzer is an entry in ./src/fuzzing/*, the default sanitizer"
echo "is \"address\" and default instrument is ( \"^.*/src/$\" )." echo "is \"address\" and default instrument is ( \"^.*/src/$\" )."
echo "" echo ""
exit -1 exit 255
} }
die() { die() {
echo $1 echo $1
exit -1 exit 255
} }
# parse command line options # parse command line options
@ -120,11 +120,12 @@ fi
set -x set -x
export ZCUTIL=$(realpath "./zcutil") ZCUTIL=$(realpath "./zcutil")
export ZCUTIL
# overwrite the Linux make profile to use clang instead of GCC: # overwrite the Linux make profile to use clang instead of GCC:
cat $ZCUTIL/../depends/hosts/linux.mk | sed -e 's/=gcc/=clang/g' | sed -e 's/=g++/=clang++/g' > x sed -e 's/=gcc/=clang/g' $ZCUTIL/../depends/hosts/linux.mk | sed -e 's/=g++/=clang++/g' > x
mv x $ZCUTIL/../depends/hosts/linux.mk mv x $ZCUTIL/../depends/hosts/linux.mk
# the build_stage distinction helps to layer an intermediate docker # the build_stage distinction helps to layer an intermediate docker
@ -134,7 +135,7 @@ mv x $ZCUTIL/../depends/hosts/linux.mk
if [ "$BUILD_STAGE" = "depends" ] if [ "$BUILD_STAGE" = "depends" ]
then then
# make an empty fuzz file just so we can build dependencies # make an empty fuzz file just so we can build dependencies
> src/fuzz.cpp true > src/fuzz.cpp
else else
cp "./src/fuzzing/$FUZZER_NAME/fuzz.cpp" src/fuzz.cpp || die "Can't copy fuzz.cpp for that fuzzer" cp "./src/fuzzing/$FUZZER_NAME/fuzz.cpp" src/fuzz.cpp || die "Can't copy fuzz.cpp for that fuzzer"
fi fi