From 1f388e3f400ae8257ef10db095d563e3ddeb018a Mon Sep 17 00:00:00 2001 From: Benjamin Bannier Date: Wed, 24 Nov 2021 22:48:46 +0100 Subject: [PATCH] Format shell scripts with shfmt. All changes in this patch were performed automatically with `shfmt` with configuration flags specified in `.pre-commit-config.yaml`. In addition to fixing whitespace the roundtrip through shfmt's AST also transforms command substitutions `cmd` # becomes $(cmd) and some redirects >&2 echo "msg" # becomes echo >&2 "msg" --- .pre-commit-config.yaml | 6 + ci/build.sh | 2 +- ci/common.sh | 4 +- ci/freebsd/prepare.sh | 2 +- ci/init-external-repos.sh | 9 +- ci/test-fuzzers.sh | 5 +- ci/test.sh | 43 +++-- ci/update-zeekygen-docs.sh | 28 ++-- configure | 144 ++++++++--------- src/script_opt/CPP/single-full-test.sh | 2 +- src/script_opt/CPP/single-test.sh | 2 +- src/script_opt/CPP/test-suite-build | 2 +- src/script_opt/CPP/update-single-test.sh | 2 +- testing/btest/coverage/zeekygen.sh | 11 +- testing/btest/plugins/bifs-and-scripts.sh | 1 - testing/coverage/code_coverage.sh | 118 +++++++------- testing/coverage/lcov_html.sh | 76 ++++----- testing/external/scripts/create-new-repo | 12 +- testing/external/scripts/diff-all | 18 +-- testing/external/scripts/find-git-repos | 2 +- testing/external/scripts/update-traces | 20 +-- testing/scripts/diff-canonifier | 2 +- testing/scripts/diff-canonifier-external | 25 ++- testing/scripts/diff-remove-abspath | 10 +- testing/scripts/diff-remove-fields | 2 +- testing/scripts/diff-remove-fractions | 1 - .../scripts/diff-remove-openclose-timestamps | 6 +- testing/scripts/diff-remove-timestamps | 8 +- testing/scripts/diff-sort | 4 +- testing/scripts/fake-sendmail | 10 +- .../scripts/update-external-repo-pointer.sh | 4 +- testing/scripts/wait-for-file | 17 +- zeek-config.in | 148 +++++++++--------- zeek-wrapper.in | 2 +- 34 files changed, 369 insertions(+), 379 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f3f52012a1..38c18b5ccf 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,3 +6,9 @@ repos: rev: 'v13.0.0' hooks: - id: clang-format + +- repo: https://github.com/maxwinterstein/shfmt-py + rev: 3.3.1.8 + hooks: + - id: shfmt + args: ["-w", "-i", "4", "-ci"] diff --git a/ci/build.sh b/ci/build.sh index 051d119f62..19a92743d1 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,6 +1,6 @@ #! /usr/bin/env bash -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" . ${SCRIPT_DIR}/common.sh set -e diff --git a/ci/common.sh b/ci/common.sh index cc84e9a973..52949dcf73 100644 --- a/ci/common.sh +++ b/ci/common.sh @@ -3,10 +3,10 @@ # On Cirrus, oversubscribe the CPUs when on Linux. This uses Cirrus' "greedy" feature. if [[ "${CIRRUS_OS}" == linux ]]; then if [[ -n "${ZEEK_CI_CPUS}" ]]; then - ZEEK_CI_CPUS=$(( 2 * ${ZEEK_CI_CPUS} )) + ZEEK_CI_CPUS=$((2 * ${ZEEK_CI_CPUS})) fi if [[ -n "${ZEEK_CI_BTEST_JOBS}" ]]; then - ZEEK_CI_BTEST_JOBS=$(( 2 * ${ZEEK_CI_BTEST_JOBS} )) + ZEEK_CI_BTEST_JOBS=$((2 * ${ZEEK_CI_BTEST_JOBS})) fi fi diff --git a/ci/freebsd/prepare.sh b/ci/freebsd/prepare.sh index 00b3965e2f..8a51a49461 100755 --- a/ci/freebsd/prepare.sh +++ b/ci/freebsd/prepare.sh @@ -8,6 +8,6 @@ set -x env ASSUME_ALWAYS_YES=YES pkg bootstrap pkg install -y bash git cmake swig bison python3 base64 pkg upgrade -y curl -pyver=`python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")'` +pyver=$(python3 -c 'import sys; print(f"py{sys.version_info[0]}{sys.version_info[1]}")') pkg install -y $pyver-sqlite3 $pyver-pip pip install junit2html diff --git a/ci/init-external-repos.sh b/ci/init-external-repos.sh index 43814a69c5..b3684b0dcd 100755 --- a/ci/init-external-repos.sh +++ b/ci/init-external-repos.sh @@ -1,13 +1,12 @@ #! /usr/bin/env bash -function banner - { +function banner { local msg="${1}" printf "+--------------------------------------------------------------+\n" printf "| %-60s |\n" "$(date)" printf "| %-60s |\n" "${msg}" printf "+--------------------------------------------------------------+\n" - } +} set -e @@ -52,8 +51,8 @@ if [[ -n "${CIRRUS_CI}" ]] && [[ "${CIRRUS_REPO_OWNER}" == "zeek" ]] && [[ ! -d fi banner "Trying to clone zeek-testing-private git repo" - echo "${ZEEK_TESTING_PRIVATE_SSH_KEY}" > cirrus_key.b64 - base64 -d cirrus_key.b64 > cirrus_key + echo "${ZEEK_TESTING_PRIVATE_SSH_KEY}" >cirrus_key.b64 + base64 -d cirrus_key.b64 >cirrus_key rm cirrus_key.b64 chmod 600 cirrus_key git --version diff --git a/ci/test-fuzzers.sh b/ci/test-fuzzers.sh index c3ae93d469..389c272066 100755 --- a/ci/test-fuzzers.sh +++ b/ci/test-fuzzers.sh @@ -17,8 +17,8 @@ for fuzzer_path in ${fuzzers}; do if [[ -e ${corpus} ]]; then echo "Fuzzer: ${fuzzer_exe} ${corpus}" - ( rm -rf corpus && mkdir corpus ) || result=1 - ( cd corpus && unzip ../${corpus} >/dev/null ) || result=1 + (rm -rf corpus && mkdir corpus) || result=1 + (cd corpus && unzip ../${corpus} >/dev/null) || result=1 ${fuzzer_path} corpus/* >${fuzzer_exe}.out 2>${fuzzer_exe}.err if [[ $? -eq 0 ]]; then @@ -36,5 +36,4 @@ for fuzzer_path in ${fuzzers}; do echo "-----------------------------------------" done - exit ${result} diff --git a/ci/test.sh b/ci/test.sh index 50d0703dc9..ba407ffec6 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -16,47 +16,41 @@ if [[ -z "${CIRRUS_CI}" ]]; then ZEEK_CI_BTEST_RETRIES=2 fi -SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" . ${SCRIPT_DIR}/common.sh -function pushd - { - command pushd "$@" > /dev/null || exit 1 - } +function pushd { + command pushd "$@" >/dev/null || exit 1 +} -function popd - { - command popd "$@" > /dev/null || exit 1 - } +function popd { + command popd "$@" >/dev/null || exit 1 +} -function banner - { +function banner { local msg="${1}" printf "+--------------------------------------------------------------+\n" printf "| %-60s |\n" "$(date)" printf "| %-60s |\n" "${msg}" printf "+--------------------------------------------------------------+\n" - } +} -function run_unit_tests - { +function run_unit_tests { banner "Running unit tests" pushd build - ( . ./zeek-path-dev.sh && zeek --test ) || result=1 + (. ./zeek-path-dev.sh && zeek --test) || result=1 popd return 0 - } +} -function prep_artifacts - { +function prep_artifacts { banner "Prepare artifacts" [[ -d .tmp ]] && rm -rf .tmp/script-coverage && tar -czf tmp.tar.gz .tmp junit2html btest-results.xml btest-results.html - } +} -function run_btests - { +function run_btests { banner "Running baseline tests: zeek" pushd testing/btest @@ -73,10 +67,9 @@ function run_btests prep_artifacts popd return 0 - } +} -function run_external_btests - { +function run_external_btests { # Commenting out this line in btest.cfg causes the script profiling/coverage # to be disabled. We do this for the sanitizer build right now because of a # fairly significant performance bug when running tests. @@ -120,7 +113,7 @@ function run_external_btests else banner "Skipping private tests (not available for PRs)" fi - } +} banner "Start tests: ${ZEEK_CI_CPUS} cpus, ${ZEEK_CI_BTEST_JOBS} btest jobs" diff --git a/ci/update-zeekygen-docs.sh b/ci/update-zeekygen-docs.sh index 1c0769bc9a..c4722237cb 100755 --- a/ci/update-zeekygen-docs.sh +++ b/ci/update-zeekygen-docs.sh @@ -1,15 +1,15 @@ #! /usr/bin/env bash -unset ZEEK_DISABLE_ZEEKYGEN; +unset ZEEK_DISABLE_ZEEKYGEN # If running this from btest, unset any of the environment # variables that alter default script values. -unset ZEEK_DEFAULT_LISTEN_ADDRESS; -unset ZEEK_DEFAULT_LISTEN_RETRY; -unset ZEEK_DEFAULT_CONNECT_RETRY; +unset ZEEK_DEFAULT_LISTEN_ADDRESS +unset ZEEK_DEFAULT_LISTEN_RETRY +unset ZEEK_DEFAULT_CONNECT_RETRY -dir="$( cd "$( dirname "$0" )" && pwd )" -source_dir="$( cd $dir/.. && pwd )" +dir="$(cd "$(dirname "$0")" && pwd)" +source_dir="$(cd $dir/.. && pwd)" build_dir=$source_dir/build conf_file=$build_dir/zeekygen-test.conf output_dir=$source_dir/doc @@ -21,15 +21,14 @@ fi case $output_dir in /*) ;; - *) output_dir=`pwd`/$output_dir ;; + *) output_dir=$(pwd)/$output_dir ;; esac cd $build_dir . zeek-path-dev.sh export ZEEK_SEED_FILE=$source_dir/testing/btest/random.seed -function run_zeek - { +function run_zeek { ZEEK_ALLOW_INIT_ERRORS=1 zeek -X $conf_file zeekygen >/dev/null 2>$zeek_error_file if [ $? -ne 0 ]; then @@ -37,23 +36,22 @@ function run_zeek echo "See stderr in $zeek_error_file" exit 1 fi - } +} scripts_output_dir=$output_dir/scripts rm -rf $scripts_output_dir -printf "script\t*\t$scripts_output_dir/" > $conf_file +printf "script\t*\t$scripts_output_dir/" >$conf_file echo "Generating $scripts_output_dir/" run_zeek script_ref_dir=$output_dir/script-reference mkdir -p $script_ref_dir -function generate_index - { +function generate_index { echo "Generating $script_ref_dir/$2" - printf "$1\t*\t$script_ref_dir/$2\n" > $conf_file + printf "$1\t*\t$script_ref_dir/$2\n" >$conf_file run_zeek - } +} generate_index "script_index" "autogenerated-script-index.rst" generate_index "package_index" "autogenerated-package-index.rst" diff --git a/configure b/configure index f40846bc43..5756c3448f 100755 --- a/configure +++ b/configure @@ -118,7 +118,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]... CXXFLAGS C++ compiler flags " -sourcedir="$( cd "$( dirname "$0" )" && pwd )" +sourcedir="$(cd "$(dirname "$0")" && pwd)" if [ ! -e "$sourcedir/cmake/COPYING" ] && [ -d "$sourcedir/.git" ]; then echo "\ @@ -128,8 +128,8 @@ This typically means that you performed a non-recursive git clone of Zeek. To check out the required subdirectories, please execute: ( cd $sourcedir && git submodule update --recursive --init ) -" >&2; - exit 1; +" >&2 + exit 1 fi # Function to append a CMake cache entry definition to the @@ -137,14 +137,14 @@ fi # $1 is the cache entry variable name # $2 is the cache entry variable type # $3 is the cache entry variable value -append_cache_entry () { +append_cache_entry() { CMakeCacheEntries="$CMakeCacheEntries -D $1:$2=$3" } # Function to remove a CMake cache entry definition from the # CMakeCacheEntries variable # $1 is the cache entry variable name -remove_cache_entry () { +remove_cache_entry() { CMakeCacheEntries="$CMakeCacheEntries -U $1" # Even with -U, cmake still warns by default if @@ -156,22 +156,22 @@ remove_cache_entry () { builddir=build prefix=/usr/local/zeek CMakeCacheEntries="" -append_cache_entry CMAKE_INSTALL_PREFIX PATH $prefix -append_cache_entry ZEEK_ROOT_DIR PATH $prefix +append_cache_entry CMAKE_INSTALL_PREFIX PATH $prefix +append_cache_entry ZEEK_ROOT_DIR PATH $prefix append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $prefix/share/zeek -append_cache_entry ZEEK_ETC_INSTALL_DIR PATH $prefix/etc -append_cache_entry ENABLE_DEBUG BOOL false -append_cache_entry ENABLE_PERFTOOLS BOOL false -append_cache_entry ENABLE_JEMALLOC BOOL false -append_cache_entry BUILD_SHARED_LIBS BOOL true -append_cache_entry INSTALL_AUX_TOOLS BOOL true -append_cache_entry INSTALL_BTEST BOOL true -append_cache_entry INSTALL_BTEST_PCAPS BOOL true -append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL true -append_cache_entry INSTALL_ZEEKCTL BOOL true -append_cache_entry INSTALL_ZKG BOOL true +append_cache_entry ZEEK_ETC_INSTALL_DIR PATH $prefix/etc +append_cache_entry ENABLE_DEBUG BOOL false +append_cache_entry ENABLE_PERFTOOLS BOOL false +append_cache_entry ENABLE_JEMALLOC BOOL false +append_cache_entry BUILD_SHARED_LIBS BOOL true +append_cache_entry INSTALL_AUX_TOOLS BOOL true +append_cache_entry INSTALL_BTEST BOOL true +append_cache_entry INSTALL_BTEST_PCAPS BOOL true +append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL true +append_cache_entry INSTALL_ZEEKCTL BOOL true +append_cache_entry INSTALL_ZKG BOOL true append_cache_entry CPACK_SOURCE_IGNORE_FILES STRING -append_cache_entry ZEEK_SANITIZERS STRING "" +append_cache_entry ZEEK_SANITIZERS STRING "" append_cache_entry ZEEK_INCLUDE_PLUGINS STRING "" has_enable_mobile_ipv6=0 @@ -179,12 +179,12 @@ has_enable_mobile_ipv6=0 # parse arguments while [ $# -ne 0 ]; do case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + -*=*) optarg=$(echo "$1" | sed 's/[-_a-zA-Z0-9]*=//') ;; *) optarg= ;; esac case "$1" in - --help|-h) + --help | -h) echo "${usage}" 1>&2 exit 1 ;; @@ -198,110 +198,110 @@ while [ $# -ne 0 ]; do builddir=$optarg ;; --build-type=*) - append_cache_entry CMAKE_BUILD_TYPE STRING $optarg + append_cache_entry CMAKE_BUILD_TYPE STRING $optarg if [ $(echo "$optarg" | tr [:upper:] [:lower:]) = "debug" ]; then - append_cache_entry ENABLE_DEBUG BOOL true + append_cache_entry ENABLE_DEBUG BOOL true fi ;; --generator=*) CMakeGenerator="$optarg" ;; --ccache) - append_cache_entry ENABLE_CCACHE BOOL true + append_cache_entry ENABLE_CCACHE BOOL true ;; --toolchain=*) - append_cache_entry CMAKE_TOOLCHAIN_FILE PATH $optarg + append_cache_entry CMAKE_TOOLCHAIN_FILE PATH $optarg ;; --include-plugins=*) - append_cache_entry ZEEK_INCLUDE_PLUGINS STRING $optarg + append_cache_entry ZEEK_INCLUDE_PLUGINS STRING $optarg ;; --prefix=*) prefix=$optarg - append_cache_entry CMAKE_INSTALL_PREFIX PATH $optarg - append_cache_entry ZEEK_ROOT_DIR PATH $optarg + append_cache_entry CMAKE_INSTALL_PREFIX PATH $optarg + append_cache_entry ZEEK_ROOT_DIR PATH $optarg ;; --libdir=*) - append_cache_entry CMAKE_INSTALL_LIBDIR PATH $optarg + append_cache_entry CMAKE_INSTALL_LIBDIR PATH $optarg ;; --plugindir=*) - append_cache_entry ZEEK_PLUGIN_DIR PATH $optarg + append_cache_entry ZEEK_PLUGIN_DIR PATH $optarg ;; --python-dir=*) - append_cache_entry ZEEK_PYTHON_DIR PATH $optarg + append_cache_entry ZEEK_PYTHON_DIR PATH $optarg ;; --python-prefix=*) - append_cache_entry ZEEK_PYTHON_PREFIX PATH $optarg + append_cache_entry ZEEK_PYTHON_PREFIX PATH $optarg ;; --python-home=*) - append_cache_entry ZEEK_PYTHON_HOME PATH $optarg + append_cache_entry ZEEK_PYTHON_HOME PATH $optarg ;; --scriptdir=*) append_cache_entry ZEEK_SCRIPT_INSTALL_PATH STRING $optarg user_set_scriptdir="true" ;; --conf-files-dir=*) - append_cache_entry ZEEK_ETC_INSTALL_DIR PATH $optarg + append_cache_entry ZEEK_ETC_INSTALL_DIR PATH $optarg user_set_conffilesdir="true" ;; --localstatedir=*) - append_cache_entry ZEEK_LOCAL_STATE_DIR PATH $optarg + append_cache_entry ZEEK_LOCAL_STATE_DIR PATH $optarg ;; --spooldir=*) - append_cache_entry ZEEK_SPOOL_DIR PATH $optarg + append_cache_entry ZEEK_SPOOL_DIR PATH $optarg ;; --logdir=*) - append_cache_entry ZEEK_LOG_DIR PATH $optarg + append_cache_entry ZEEK_LOG_DIR PATH $optarg ;; --mandir=*) - append_cache_entry ZEEK_MAN_INSTALL_PATH PATH $optarg + append_cache_entry ZEEK_MAN_INSTALL_PATH PATH $optarg ;; --enable-coverage) - append_cache_entry ENABLE_COVERAGE BOOL true - append_cache_entry ENABLE_DEBUG BOOL true + append_cache_entry ENABLE_COVERAGE BOOL true + append_cache_entry ENABLE_DEBUG BOOL true ;; --enable-fuzzers) append_cache_entry ZEEK_ENABLE_FUZZERS BOOL true ;; --enable-debug) - append_cache_entry ENABLE_DEBUG BOOL true + append_cache_entry ENABLE_DEBUG BOOL true ;; --enable-mobile-ipv6) has_enable_mobile_ipv6=1 ;; --enable-perftools) - append_cache_entry ENABLE_PERFTOOLS BOOL true + append_cache_entry ENABLE_PERFTOOLS BOOL true ;; --enable-perftools-debug) - append_cache_entry ENABLE_PERFTOOLS BOOL true - append_cache_entry ENABLE_PERFTOOLS_DEBUG BOOL true + append_cache_entry ENABLE_PERFTOOLS BOOL true + append_cache_entry ENABLE_PERFTOOLS_DEBUG BOOL true ;; --sanitizers=*) - append_cache_entry ZEEK_SANITIZERS STRING $optarg + append_cache_entry ZEEK_SANITIZERS STRING $optarg ;; --enable-jemalloc) - append_cache_entry ENABLE_JEMALLOC BOOL true + append_cache_entry ENABLE_JEMALLOC BOOL true ;; --enable-static-broker) - append_cache_entry BUILD_STATIC_BROKER BOOL true + append_cache_entry BUILD_STATIC_BROKER BOOL true ;; --enable-static-binpac) - append_cache_entry BUILD_STATIC_BINPAC BOOL true + append_cache_entry BUILD_STATIC_BINPAC BOOL true ;; --enable-cpp-tests) - append_cache_entry ENABLE_ZEEK_UNIT_TESTS BOOL true + append_cache_entry ENABLE_ZEEK_UNIT_TESTS BOOL true ;; --enable-zeek-client) - append_cache_entry INSTALL_ZEEK_CLIENT BOOL true + append_cache_entry INSTALL_ZEEK_CLIENT BOOL true ;; --disable-zeekctl) - append_cache_entry INSTALL_ZEEKCTL BOOL false + append_cache_entry INSTALL_ZEEKCTL BOOL false ;; --disable-auxtools) - append_cache_entry INSTALL_AUX_TOOLS BOOL false + append_cache_entry INSTALL_AUX_TOOLS BOOL false ;; --disable-archiver) - append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL false + append_cache_entry INSTALL_ZEEK_ARCHIVER BOOL false ;; --disable-btest) append_cache_entry INSTALL_BTEST BOOL false @@ -310,10 +310,10 @@ while [ $# -ne 0 ]; do append_cache_entry INSTALL_BTEST_PCAPS BOOL false ;; --disable-python) - append_cache_entry DISABLE_PYTHON_BINDINGS BOOL true + append_cache_entry DISABLE_PYTHON_BINDINGS BOOL true ;; --disable-broker-tests) - append_cache_entry BROKER_DISABLE_TESTS BOOL true + append_cache_entry BROKER_DISABLE_TESTS BOOL true append_cache_entry BROKER_DISABLE_DOC_EXAMPLES BOOL true ;; --disable-zkg) @@ -329,10 +329,10 @@ while [ $# -ne 0 ]; do append_cache_entry PCAP_ROOT_DIR PATH $optarg ;; --with-binpac=*) - append_cache_entry BINPAC_EXE_PATH PATH $optarg + append_cache_entry BINPAC_EXE_PATH PATH $optarg ;; --with-bifcl=*) - append_cache_entry BIFCL_EXE_PATH PATH $optarg + append_cache_entry BIFCL_EXE_PATH PATH $optarg ;; --with-flex=*) append_cache_entry FLEX_EXECUTABLE PATH $optarg @@ -350,30 +350,30 @@ while [ $# -ne 0 ]; do append_cache_entry GooglePerftools_ROOT_DIR PATH $optarg ;; --with-jemalloc=*) - append_cache_entry JEMALLOC_ROOT_DIR PATH $optarg - append_cache_entry ENABLE_JEMALLOC BOOL true + append_cache_entry JEMALLOC_ROOT_DIR PATH $optarg + append_cache_entry ENABLE_JEMALLOC BOOL true ;; --with-python=*) - append_cache_entry PYTHON_EXECUTABLE PATH $optarg + append_cache_entry PYTHON_EXECUTABLE PATH $optarg ;; --with-python-lib=*) - append_cache_entry PYTHON_LIBRARY PATH $optarg + append_cache_entry PYTHON_LIBRARY PATH $optarg ;; --with-python-inc=*) - append_cache_entry PYTHON_INCLUDE_DIR PATH $optarg - append_cache_entry PYTHON_INCLUDE_PATH PATH $optarg + append_cache_entry PYTHON_INCLUDE_DIR PATH $optarg + append_cache_entry PYTHON_INCLUDE_PATH PATH $optarg ;; --with-swig=*) - append_cache_entry SWIG_EXECUTABLE PATH $optarg + append_cache_entry SWIG_EXECUTABLE PATH $optarg ;; --with-broker=*) - append_cache_entry BROKER_ROOT_DIR PATH $optarg + append_cache_entry BROKER_ROOT_DIR PATH $optarg ;; --with-caf=*) - append_cache_entry CAF_ROOT PATH $optarg + append_cache_entry CAF_ROOT PATH $optarg ;; --with-libkqueue=*) - append_cache_entry LIBKQUEUE_ROOT_DIR PATH $optarg + append_cache_entry LIBKQUEUE_ROOT_DIR PATH $optarg ;; --binary-package) append_cache_entry BINARY_PACKAGING_MODE BOOL true @@ -400,15 +400,15 @@ done if [ -z "$CMakeCommand" ]; then # prefer cmake3 over "regular" cmake (cmake == cmake2 on RHEL) - if command -v cmake3 >/dev/null 2>&1 ; then + if command -v cmake3 >/dev/null 2>&1; then CMakeCommand="cmake3" - elif command -v cmake >/dev/null 2>&1 ; then + elif command -v cmake >/dev/null 2>&1; then CMakeCommand="cmake" else echo "This package requires CMake, please install it first." echo "Then you may use this script to configure the CMake build." echo "Note: pass --cmake=PATH to use cmake in non-standard locations." - exit 1; + exit 1 fi fi @@ -442,8 +442,8 @@ else "$CMakeCommand" $CMakeCacheEntries $sourcedir fi -echo "# This is the command used to configure this build" > config.status -echo $command >> config.status +echo "# This is the command used to configure this build" >config.status +echo $command >>config.status chmod u+x config.status if [ $has_enable_mobile_ipv6 -eq 1 ]; then diff --git a/src/script_opt/CPP/single-full-test.sh b/src/script_opt/CPP/single-full-test.sh index 84d9b21479..71fc927b27 100755 --- a/src/script_opt/CPP/single-full-test.sh +++ b/src/script_opt/CPP/single-full-test.sh @@ -16,7 +16,7 @@ cd $test grep -c '^namespace' $gen mv $gen $build/ cd $build -ninja >& errs || echo build for $1 failed +ninja >&errs || echo build for $1 failed export -n ZEEK_GEN_CPP cd $test diff --git a/src/script_opt/CPP/single-test.sh b/src/script_opt/CPP/single-test.sh index 6d2a117e67..afc552ce03 100755 --- a/src/script_opt/CPP/single-test.sh +++ b/src/script_opt/CPP/single-test.sh @@ -15,7 +15,7 @@ cp $build/CPP-hashes.dat . grep -c '^namespace' $gen mv $gen $build cd $build -ninja >& errs || echo build for $1 failed +ninja >&errs || echo build for $1 failed export -n ZEEK_ADD_CPP cd $test diff --git a/src/script_opt/CPP/test-suite-build b/src/script_opt/CPP/test-suite-build index a79ffd88bb..0e06a7ba71 100755 --- a/src/script_opt/CPP/test-suite-build +++ b/src/script_opt/CPP/test-suite-build @@ -15,4 +15,4 @@ echo >$gen grep -c '^namespace' $gen mv $gen $so cd $build -ninja >& errs || echo test suite build failed +ninja >&errs || echo test suite build failed diff --git a/src/script_opt/CPP/update-single-test.sh b/src/script_opt/CPP/update-single-test.sh index aa521a053e..35fb2a2d77 100755 --- a/src/script_opt/CPP/update-single-test.sh +++ b/src/script_opt/CPP/update-single-test.sh @@ -13,7 +13,7 @@ cp $build/CPP-hashes.dat . grep -c '^namespace' $gen mv $gen $build/ cd $build -ninja >& errs || echo build for $1 failed +ninja >&errs || echo build for $1 failed export -n ZEEK_ADD_CPP cd $test diff --git a/testing/btest/coverage/zeekygen.sh b/testing/btest/coverage/zeekygen.sh index 6bc43d9c90..ccde52d90c 100644 --- a/testing/btest/coverage/zeekygen.sh +++ b/testing/btest/coverage/zeekygen.sh @@ -10,11 +10,10 @@ error_count=0 -error_msg() - { - error_count=$((error_count+1)) - echo "$@" 1>&2; - } +error_msg() { + error_count=$((error_count + 1)) + echo "$@" 1>&2 +} if [ $# -ne 2 ]; then print "incorrect arguments" @@ -29,7 +28,7 @@ for f in $all_loads; do done if [ $error_count -gt 0 ]; then - exit 1; + exit 1 fi exit 0 diff --git a/testing/btest/plugins/bifs-and-scripts.sh b/testing/btest/plugins/bifs-and-scripts.sh index 345c1faa8f..180b95c5c5 100644 --- a/testing/btest/plugins/bifs-and-scripts.sh +++ b/testing/btest/plugins/bifs-and-scripts.sh @@ -60,4 +60,3 @@ EOF cat >activate.zeek <>$OUTPUT - done + PERCENTAGE=$(echo "scale=3;100*$RUN/$TOTAL" | bc | tr "\n" " ") + printf "%-50s\t%12s\t%6s %%\n" "$i" "$RUN/$TOTAL" $PERCENTAGE | + sed 's|#|/|g' >>$OUTPUT + done } # 1. Run test suite @@ -89,7 +89,7 @@ echo -n "Checking for coverage files... " for pat in gcda gcno; do if [ -z "$(find "$BASE" -name "*.$pat" 2>/dev/null)" ]; then echo "no .$pat files, nothing to do" - exit 0 + exit 0 fi done echo "ok" @@ -97,24 +97,24 @@ echo "ok" # 3a. Run gcov (-p to preserve path) and move into tmp directory # ... if system does not have gcov installed, exit with message. echo -n "Creating coverage files... " -if which gcov > /dev/null 2>&1; then - ( cd "$TMP" && find "$BASE" -name "*.o" -exec gcov -p {} > /dev/null 2>&1 \; ) - NUM_GCOVS=$(find "$TMP" -name *.gcov | wc -l) - if [ $NUM_GCOVS -eq 0 ]; then - echo "no gcov files produced, aborting" - exit 1 - fi +if which gcov >/dev/null 2>&1; then + (cd "$TMP" && find "$BASE" -name "*.o" -exec gcov -p {} \; >/dev/null 2>&1) + NUM_GCOVS=$(find "$TMP" -name *.gcov | wc -l) + if [ $NUM_GCOVS -eq 0 ]; then + echo "no gcov files produced, aborting" + exit 1 + fi - # Account for '^' that occurs in macOS due to LLVM - # This character seems to be equivalent to ".." (up 1 dir) - for file in $(ls $TMP/*.gcov | grep '\^'); do - mv $file "$(sed 's/#[^#]*#\^//g' <<< "$file")" - done + # Account for '^' that occurs in macOS due to LLVM + # This character seems to be equivalent to ".." (up 1 dir) + for file in $(ls $TMP/*.gcov | grep '\^'); do + mv $file "$(sed 's/#[^#]*#\^//g' <<<"$file")" + done - echo "ok, $NUM_GCOVS coverage files" + echo "ok, $NUM_GCOVS coverage files" else - echo "gcov is not installed on system, aborting" - exit 1 + echo "gcov is not installed on system, aborting" + exit 1 fi # 3b. Prune gcov files that fall outside of the Zeek tree: @@ -134,7 +134,7 @@ echo "ok, $NUM_GCOVS coverage files remain" echo -n "Creating summary file... " DATA="${TMP}/data.txt" SUMMARY="$CURR/coverage.log" -check_file_coverage "$TMP" > "$DATA" +check_file_coverage "$TMP" >"$DATA" check_group_coverage "$DATA" ${BASE##*/} $SUMMARY echo "ok" diff --git a/testing/coverage/lcov_html.sh b/testing/coverage/lcov_html.sh index 5f13e45365..1366c23f78 100755 --- a/testing/coverage/lcov_html.sh +++ b/testing/coverage/lcov_html.sh @@ -14,10 +14,10 @@ function finish { rm -rf "$TMP" } function verify_run { - if bash -c "$1" > /dev/null 2>&1; then - echo ${2:-"ok"} + if bash -c "$1" >/dev/null 2>&1; then + echo ${2:-"ok"} else - die ${3:-"error, abort"} + die ${3:-"error, abort"} fi } trap finish EXIT @@ -50,37 +50,37 @@ Usage: $0 exit 1 } -while (( "$#" )); do +while (("$#")); do case "$1" in - --html) - HTML_REPORT=1 - if [ ${#2} -eq 0 ]; then - COVERAGE_HTML_DIR="coverage-html" - shift 1 - else - COVERAGE_HTML_DIR=$2 - shift 2 - fi - ;; - --coveralls) - if [ ${#2} -eq 0 ]; then - echo "ERROR: Coveralls repo token must be passed with --coveralls argument." - echo - usage - fi + --html) + HTML_REPORT=1 + if [ ${#2} -eq 0 ]; then + COVERAGE_HTML_DIR="coverage-html" + shift 1 + else + COVERAGE_HTML_DIR=$2 + shift 2 + fi + ;; + --coveralls) + if [ ${#2} -eq 0 ]; then + echo "ERROR: Coveralls repo token must be passed with --coveralls argument." + echo + usage + fi - HTML_REPORT=0 - COVERALLS_REPO_TOKEN=$2 - shift 2 - ;; - --help) - usage - shift 1 - ;; - *) - COVERAGE_HTML_DIR="${1:-"coverage-html"}" - shift 1 - ;; + HTML_REPORT=0 + COVERALLS_REPO_TOKEN=$2 + shift 2 + ;; + --help) + usage + shift 1 + ;; + *) + COVERAGE_HTML_DIR="${1:-"coverage-html"}" + shift 1 + ;; esac done @@ -96,7 +96,7 @@ fi REMOVE_TARGETS="*.yy *.ll *.y *.l \*/bro.dir/\* *.bif \*/zeek.dir/\* \*/src/3rdparty/\* \*/src/zeek/3rdparty/\* \*/auxil/\* " # 1. Move to base dir, create tmp dir -cd ../../; +cd ../../ mkdir "$TMP" # 2. Check for .gcno and .gcda file presence @@ -104,7 +104,7 @@ echo -n "Checking for coverage files... " for pat in gcda gcno; do if [ -z "$(find . -name "*.$pat" 2>/dev/null)" ]; then echo "no .$pat files, nothing to do" - exit 0 + exit 0 fi done echo "ok" @@ -112,8 +112,8 @@ echo "ok" # 3. If lcov does not exist, abort process. echo -n "Checking for lcov... " verify_run "which lcov" \ - "lcov installed on system, continue" \ - "lcov not installed, abort" + "lcov installed on system, continue" \ + "lcov not installed, abort" # 4. Create a "tracefile" through lcov, which is necessary to create output later on. echo -n "Creating tracefile for output generation... " @@ -142,9 +142,9 @@ else # If we're being called by Cirrus, add some additional information to the output. if [ -n "${CIRRUS_BUILD_ID}" ]; then - coveralls_cmd="${coveralls_cmd} --service-name=cirrus --service-job-id=${CIRRUS_BUILD_ID}" + coveralls_cmd="${coveralls_cmd} --service-name=cirrus --service-job-id=${CIRRUS_BUILD_ID}" else - coveralls_cmd="${coveralls_cmd} --service-name=local" + coveralls_cmd="${coveralls_cmd} --service-name=local" fi coveralls_cmd="${coveralls_cmd} ${COVERAGE_FILE_CLEAN}" diff --git a/testing/external/scripts/create-new-repo b/testing/external/scripts/create-new-repo index 7ea5be13a4..9c625128b3 100755 --- a/testing/external/scripts/create-new-repo +++ b/testing/external/scripts/create-new-repo @@ -3,14 +3,14 @@ # Helper script for creating new external testing repos. See the # README for details. -cwd=`pwd` +cwd=$(pwd) if [ -z "$1" ]; then echo "usage: $0 []" exit 1 fi -name=`pwd`/$1 +name=$(pwd)/$1 repo=$2 if [ -e $name ]; then @@ -29,10 +29,10 @@ done ln -s ../subdir-btest.cfg ./btest.cfg -cp $cwd/`dirname $0`/skel/test.skeleton tests -cp $cwd/`dirname $0`/skel/traces.cfg . -cp $cwd/`dirname $0`/skel/Makefile . -cp $cwd/`dirname $0`/skel/.gitignore . +cp $cwd/$(dirname $0)/skel/test.skeleton tests +cp $cwd/$(dirname $0)/skel/traces.cfg . +cp $cwd/$(dirname $0)/skel/Makefile . +cp $cwd/$(dirname $0)/skel/.gitignore . git add * .gitignore diff --git a/testing/external/scripts/diff-all b/testing/external/scripts/diff-all index da4333e10e..7718465ab2 100755 --- a/testing/external/scripts/diff-all +++ b/testing/external/scripts/diff-all @@ -16,12 +16,12 @@ else rm -f $diag fi -rc=0; +rc=0 -files_cwd=`ls $@` -files_baseline=`cd $TEST_BASELINE && ls $@` +files_cwd=$(ls $@) +files_baseline=$(cd $TEST_BASELINE && ls $@) -for i in `echo $files_cwd $files_baseline | sort | uniq`; do +for i in $(echo $files_cwd $files_baseline | sort | uniq); do if [[ "$i" != "loaded_scripts.log" && "$i" != "prof.log" && "$i" != "debug.log" && "$i" != "stats.log" && "$i" != broker_*.log ]]; then if [[ "$i" == "reporter.log" ]]; then @@ -33,11 +33,11 @@ for i in `echo $files_cwd $files_baseline | sort | uniq`; do fi if ! btest-diff $i; then - echo "" >>$diag - echo "#### btest-diff $i" >>$diag - echo "" >>$diag - cat $diag.tmp >>$diag - rc=1 + echo "" >>$diag + echo "#### btest-diff $i" >>$diag + echo "" >>$diag + cat $diag.tmp >>$diag + rc=1 fi fi done diff --git a/testing/external/scripts/find-git-repos b/testing/external/scripts/find-git-repos index 5efd3346d6..f448d9e31c 100755 --- a/testing/external/scripts/find-git-repos +++ b/testing/external/scripts/find-git-repos @@ -3,6 +3,6 @@ # Returns a list of git repositories found in subdirs of the # current directory. -for i in `find . -type d`; do +for i in $(find . -type d); do test -e $i/.git && echo $i done diff --git a/testing/external/scripts/update-traces b/testing/external/scripts/update-traces index 44cb33cc0e..44c7487125 100755 --- a/testing/external/scripts/update-traces +++ b/testing/external/scripts/update-traces @@ -5,7 +5,7 @@ # traces.cfg must consist of lines of the form " [[:]]" if [ "$1" == "" ]; then - echo "usage: `basename $0` " + echo "usage: $(basename $0) " exit 1 fi @@ -18,7 +18,7 @@ cfg=traces.cfg for p in .proxy ../.proxy; do if [ -e $p ]; then - proxy=`cat $p | head -1 | awk '{print $1}'` + proxy=$(cat $p | head -1 | awk '{print $1}') echo Using proxy $proxy ... proxy="ALL_PROXY=$proxy" break @@ -37,16 +37,16 @@ cat $cfg | while read line; do continue fi - url=`echo $line | awk '{print $1}'` - auth=`echo $line | awk '{print $2}'` + url=$(echo $line | awk '{print $1}') + auth=$(echo $line | awk '{print $2}') - file=$1/`echo $url | sed 's#^.*/##g'` + file=$1/$(echo $url | sed 's#^.*/##g') fp=$file.md5sum if [ "$auth" != "" ]; then auth="-u $auth" # Hide the hostname and directory names in output messages - safe_url=`echo $url | sed 's#/[A-Za-z].*/#/[hidden]/#'` + safe_url=$(echo $url | sed 's#/[A-Za-z].*/#/[hidden]/#') else safe_url=$url fi @@ -66,7 +66,7 @@ cat $cfg | while read line; do download=1 fi else - download=1 + download=1 fi if [ "$download" = "1" ]; then @@ -77,9 +77,9 @@ cat $cfg | while read line; do } echo mv $fp.tmp $fp - #else - # echo "`basename $file` already available." - fi + #else + # echo "`basename $file` already available." + fi rm -f $fp.tmp diff --git a/testing/scripts/diff-canonifier b/testing/scripts/diff-canonifier index 3cb213a3f7..5bfcac4d5f 100755 --- a/testing/scripts/diff-canonifier +++ b/testing/scripts/diff-canonifier @@ -2,4 +2,4 @@ # # Default canonifier used with the tests in testing/btest/*. -`dirname $0`/diff-remove-timestamps +$(dirname $0)/diff-remove-timestamps diff --git a/testing/scripts/diff-canonifier-external b/testing/scripts/diff-canonifier-external index 99520adbb4..43d2182fbd 100755 --- a/testing/scripts/diff-canonifier-external +++ b/testing/scripts/diff-canonifier-external @@ -3,28 +3,27 @@ # Default canonifier used with the trace-based tests in testing/external/*. if [ $# != 1 ]; then - echo "usage: `basename $0` " + echo "usage: $(basename $0) " exit 1 fi -filename=`basename $1` +filename=$(basename $1) addl="cat" if [ "$filename" == "capture_loss.log" ]; then - addl="`dirname $0`/diff-remove-fractions" + addl="$(dirname $0)/diff-remove-fractions" fi if [ "$filename" == "ssh.log" ]; then - addl="`dirname $0`/diff-remove-fields remote_location" + addl="$(dirname $0)/diff-remove-fields remote_location" fi -`dirname $0`/diff-remove-timestamps \ - | `dirname $0`/diff-remove-uids \ - | `dirname $0`/diff-remove-file-ids \ - | `dirname $0`/diff-remove-x509-names \ - | `dirname $0`/diff-sort-conn-service \ - | `dirname $0`/diff-sort-set-elements \ - | `dirname $0`/diff-sort \ - | eval $addl - +$(dirname $0)/diff-remove-timestamps | + $(dirname $0)/diff-remove-uids | + $(dirname $0)/diff-remove-file-ids | + $(dirname $0)/diff-remove-x509-names | + $(dirname $0)/diff-sort-conn-service | + $(dirname $0)/diff-sort-set-elements | + $(dirname $0)/diff-sort | + eval $addl diff --git a/testing/scripts/diff-remove-abspath b/testing/scripts/diff-remove-abspath index 14d5fca052..e08d64d5e2 100755 --- a/testing/scripts/diff-remove-abspath +++ b/testing/scripts/diff-remove-abspath @@ -2,11 +2,11 @@ # # Replace absolute paths with the basename. -if [ `uname` == "Linux" ]; then - sed="sed -r" +if [ $(uname) == "Linux" ]; then + sed="sed -r" else - sed="sed -E" + sed="sed -E" fi -$sed 's#/+#/#g' | \ -$sed 's#/([^ :/]{1,}/){1,}([^ :/]{1,})#<...>/\2#g' +$sed 's#/+#/#g' | + $sed 's#/([^ :/]{1,}/){1,}([^ :/]{1,})#<...>/\2#g' diff --git a/testing/scripts/diff-remove-fields b/testing/scripts/diff-remove-fields index 3b20425f72..762288a505 100755 --- a/testing/scripts/diff-remove-fields +++ b/testing/scripts/diff-remove-fields @@ -4,7 +4,7 @@ # prefix. if [ $# != 1 ]; then - echo "usage: `basename $0` " + echo "usage: $(basename $0) " exit 1 fi diff --git a/testing/scripts/diff-remove-fractions b/testing/scripts/diff-remove-fractions index 975157913c..fc8b0345f6 100755 --- a/testing/scripts/diff-remove-fractions +++ b/testing/scripts/diff-remove-fractions @@ -3,4 +3,3 @@ # Replace fractions of double value (i.e., 3.14 -> 3.x). sed 's/\.[0-9]\{1,\}/.X/g' - diff --git a/testing/scripts/diff-remove-openclose-timestamps b/testing/scripts/diff-remove-openclose-timestamps index e3e0a201be..a70989540f 100755 --- a/testing/scripts/diff-remove-openclose-timestamps +++ b/testing/scripts/diff-remove-openclose-timestamps @@ -3,10 +3,10 @@ # Replace timestamps in the #start/end markers in logs. # Get us "modern" regexps with sed. -if [ `uname` == "Linux" ]; then - sed="sed -r" +if [ $(uname) == "Linux" ]; then + sed="sed -r" else - sed="sed -E" + sed="sed -E" fi $sed 's/^ *#(open|close).(19|20)..-..-..-..-..-..$/#\1 XXXX-XX-XX-XX-XX-XX/g' diff --git a/testing/scripts/diff-remove-timestamps b/testing/scripts/diff-remove-timestamps index 0bcc458739..46f3f34e00 100755 --- a/testing/scripts/diff-remove-timestamps +++ b/testing/scripts/diff-remove-timestamps @@ -3,10 +3,10 @@ # Replace anything which looks like timestamps with XXXs (including the #start/end markers in logs). # Get us "modern" regexps with sed. -if [ `uname` == "Linux" ]; then - sed="sed -r" +if [ $(uname) == "Linux" ]; then + sed="sed -r" else - sed="sed -E" + sed="sed -E" fi -$sed -e 's/(^|[^0-9])([0-9]{9,10}\.[0-9]{1,8})/\1XXXXXXXXXX.XXXXXX/g' -e 's/^ *#(open|close).(19|20)..-..-..-..-..-..$/#\1 XXXX-XX-XX-XX-XX-XX/g' +$sed -e 's/(^|[^0-9])([0-9]{9,10}\.[0-9]{1,8})/\1XXXXXXXXXX.XXXXXX/g' -e 's/^ *#(open|close).(19|20)..-..-..-..-..-..$/#\1 XXXX-XX-XX-XX-XX-XX/g' diff --git a/testing/scripts/diff-sort b/testing/scripts/diff-sort index 08b36c79bf..66e2893c80 100755 --- a/testing/scripts/diff-sort +++ b/testing/scripts/diff-sort @@ -8,11 +8,11 @@ if [ "$TMP" == "" ]; then TMP=/tmp fi -tmp=$TMP/`basename $0`.$$.tmp +tmp=$TMP/$(basename $0).$$.tmp cat >$tmp -echo "### NOTE: This file has been sorted with `basename $0`." +echo "### NOTE: This file has been sorted with $(basename $0)." cat $tmp | grep ^# cat $tmp | grep -v ^# | sort -s diff --git a/testing/scripts/fake-sendmail b/testing/scripts/fake-sendmail index 4483460261..4cc09f6b2f 100755 --- a/testing/scripts/fake-sendmail +++ b/testing/scripts/fake-sendmail @@ -2,14 +2,14 @@ # # Just writes the arguments and stdin to a file, to compare with diff -echo "------- cmdline args -----------" >> sendmail.out -echo "$*" >> sendmail.out -echo "----------- stdin --------------" >> sendmail.out +echo "------- cmdline args -----------" >>sendmail.out +echo "$*" >>sendmail.out +echo "----------- stdin --------------" >>sendmail.out while IFS= read -r line; do # Strip out the user agent, which is version dependent if [[ $line == "User-Agent: Zeek/"* ]]; then - printf 'User-Agent: Zeek/$zeek_version()\n' >> sendmail.out + printf 'User-Agent: Zeek/$zeek_version()\n' >>sendmail.out else - printf '%s\n' "$line" >> sendmail.out + printf '%s\n' "$line" >>sendmail.out fi done diff --git a/testing/scripts/update-external-repo-pointer.sh b/testing/scripts/update-external-repo-pointer.sh index e6711a0d9d..bbd400a4c1 100755 --- a/testing/scripts/update-external-repo-pointer.sh +++ b/testing/scripts/update-external-repo-pointer.sh @@ -41,8 +41,8 @@ if [ "$file_hash" != "$head_hash" ]; then read -p "[Y/n] " choice case "$choice" in - n|N) echo "Skipped '$repo_base'";; - *) echo $head_hash > $hash_file && git add $hash_file && echo "Updated '$file_base'";; + n | N) echo "Skipped '$repo_base'" ;; + *) echo $head_hash >$hash_file && git add $hash_file && echo "Updated '$file_base'" ;; esac else echo " none" diff --git a/testing/scripts/wait-for-file b/testing/scripts/wait-for-file index 7a0a6f6874..d1b1ae7ced 100755 --- a/testing/scripts/wait-for-file +++ b/testing/scripts/wait-for-file @@ -3,8 +3,8 @@ # Sleeps until a file comes into existence. if [[ $# -ne 2 ]]; then - >&2 echo "usage: $0 " - exit 1 + echo >&2 "usage: $0 " + exit 1 fi wait_file=$1 @@ -12,13 +12,12 @@ max_wait=$2 wait_count=0 while [[ ! -e $wait_file ]]; do - let "wait_count += 1" + let "wait_count += 1" - if [[ $wait_count -ge $max_wait ]]; then - >&2 echo "error: file '$wait_file' does not exist after $max_wait seconds" - exit 1 - fi + if [[ $wait_count -ge $max_wait ]]; then + echo >&2 "error: file '$wait_file' does not exist after $max_wait seconds" + exit 1 + fi - sleep 1 + sleep 1 done - diff --git a/zeek-config.in b/zeek-config.in index 8aa200db73..20c3e22475 100755 --- a/zeek-config.in +++ b/zeek-config.in @@ -22,9 +22,9 @@ add_path() { # $1: existing path # $2: path to add if test -z "$2" || test "$1" = "$2" || - echo "$1" | grep -q "^$2:" 2>/dev/null || - echo "$1" | grep -q ":$2:" 2>/dev/null || - echo "$1" | grep -q ":$2$" 2>/dev/null; then + echo "$1" | grep -q "^$2:" 2>/dev/null || + echo "$1" | grep -q ":$2:" 2>/dev/null || + echo "$1" | grep -q ":$2$" 2>/dev/null; then echo "$1" return fi @@ -69,81 +69,81 @@ Toplevel installation directories for third-party components: " } -if [ $# -eq 0 ] ; then - usage 1>&2 - exit 1 +if [ $# -eq 0 ]; then + usage 1>&2 + exit 1 fi while [ $# -ne 0 ]; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac + case "$1" in + -*=*) optarg=$(echo "$1" | sed 's/[-_a-zA-Z0-9]*=//') ;; + *) optarg= ;; + esac - case $1 in - --binpac_root) - echo $binpac_root - ;; - --bro_dist) # For compatibility with legacy Bro plugins. - echo $zeek_dist - ;; - --broker_root) - echo $broker_root - ;; - --bropath) # For compatibility with legacy Bro plugins. - echo $zeekpath - ;; - --btest_tools_dir) - echo $btest_tools_dir - ;; - --build_type) - echo $build_type - ;; - --caf_root) - echo $caf_root - ;; - --cmake_dir) - echo $cmake_dir - ;; - --config_dir) - echo $config_dir - ;; - --include_dir) - echo $include_dir - ;; - --lib_dir) - echo $lib_dir - ;; - --plugin_dir) - echo $plugin_dir - ;; - --prefix) - echo $prefix - ;; - --python_dir) - echo $python_dir - ;; - --script_dir) - echo $script_dir - ;; - --site_dir) - echo $site_dir - ;; - --version) - echo $version - ;; - --zeek_dist) - echo $zeek_dist - ;; - --zeekpath) - echo $zeekpath - ;; - *) - usage 1>&2 - exit 1 - ;; - esac - shift + case $1 in + --binpac_root) + echo $binpac_root + ;; + --bro_dist) # For compatibility with legacy Bro plugins. + echo $zeek_dist + ;; + --broker_root) + echo $broker_root + ;; + --bropath) # For compatibility with legacy Bro plugins. + echo $zeekpath + ;; + --btest_tools_dir) + echo $btest_tools_dir + ;; + --build_type) + echo $build_type + ;; + --caf_root) + echo $caf_root + ;; + --cmake_dir) + echo $cmake_dir + ;; + --config_dir) + echo $config_dir + ;; + --include_dir) + echo $include_dir + ;; + --lib_dir) + echo $lib_dir + ;; + --plugin_dir) + echo $plugin_dir + ;; + --prefix) + echo $prefix + ;; + --python_dir) + echo $python_dir + ;; + --script_dir) + echo $script_dir + ;; + --site_dir) + echo $site_dir + ;; + --version) + echo $version + ;; + --zeek_dist) + echo $zeek_dist + ;; + --zeekpath) + echo $zeekpath + ;; + *) + usage 1>&2 + exit 1 + ;; + esac + shift done exit 0 diff --git a/zeek-wrapper.in b/zeek-wrapper.in index 939424d28b..0f13f7fe63 100755 --- a/zeek-wrapper.in +++ b/zeek-wrapper.in @@ -6,7 +6,7 @@ # exit code. function deprecated { -cat >&2 <&2 <