diff options
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/commitcheck.sh | 19 | ||||
| -rwxr-xr-x | scripts/zfs.sh | 5 | ||||
| -rwxr-xr-x | scripts/zimport.sh | 1 | ||||
| -rwxr-xr-x | scripts/zloop.sh | 6 |
4 files changed, 17 insertions, 14 deletions
diff --git a/scripts/commitcheck.sh b/scripts/commitcheck.sh index 927f5e737..190943916 100755 --- a/scripts/commitcheck.sh +++ b/scripts/commitcheck.sh @@ -19,7 +19,7 @@ function test_url() function test_commit_bodylength() { length="72" - body=$(git log -n 1 --pretty=%b "$REF" | egrep -m 1 ".{$((length + 1))}") + body=$(git log -n 1 --pretty=%b "$REF" | grep -E -m 1 ".{$((length + 1))}") if [ -n "$body" ]; then echo "error: commit message body contains line over ${length} characters" return 1 @@ -32,7 +32,7 @@ function test_commit_bodylength() function check_tagged_line() { regex='^\s*'"$1"':\s[[:print:]]+\s<[[:graph:]]+>$' - foundline=$(git log -n 1 "$REF" | egrep -m 1 "$regex") + foundline=$(git log -n 1 "$REF" | grep -E -m 1 "$regex") if [ -z "$foundline" ]; then echo "error: missing \"$1\"" return 1 @@ -69,7 +69,7 @@ function new_change_commit() error=0 # subject is not longer than 50 characters - long_subject=$(git log -n 1 --pretty=%s "$REF" | egrep -m 1 '.{51}') + long_subject=$(git log -n 1 --pretty=%s "$REF" | grep -E -m 1 '.{51}') if [ -n "$long_subject" ]; then echo "error: commit subject over 50 characters" error=1 @@ -91,7 +91,7 @@ function new_change_commit() function is_openzfs_port() { # subject starts with OpenZFS means it's an openzfs port - subject=$(git log -n 1 --pretty=%s "$REF" | egrep -m 1 '^OpenZFS') + subject=$(git log -n 1 --pretty=%s "$REF" | grep -E -m 1 '^OpenZFS') if [ -n "$subject" ]; then return 0 fi @@ -104,7 +104,7 @@ function openzfs_port_commit() error=0 # subject starts with OpenZFS dddd - subject=$(git log -n 1 --pretty=%s "$REF" | egrep -m 1 '^OpenZFS [[:digit:]]+(, [[:digit:]]+)* - ') + subject=$(git log -n 1 --pretty=%s "$REF" | grep -E -m 1 '^OpenZFS [[:digit:]]+(, [[:digit:]]+)* - ') if [ -z "$subject" ]; then echo "error: OpenZFS patch ports must have a subject line that starts with \"OpenZFS dddd - \"" error=1 @@ -146,7 +146,7 @@ function openzfs_port_commit() function is_coverity_fix() { # subject starts with Fix coverity defects means it's a coverity fix - subject=$(git log -n 1 --pretty=%s "$REF" | egrep -m 1 '^Fix coverity defects') + subject=$(git log -n 1 --pretty=%s "$REF" | grep -E -m 1 '^Fix coverity defects') if [ -n "$subject" ]; then return 0 fi @@ -160,7 +160,7 @@ function coverity_fix_commit() # subject starts with Fix coverity defects: CID dddd, dddd... subject=$(git log -n 1 --pretty=%s "$REF" | - egrep -m 1 'Fix coverity defects: CID [[:digit:]]+(, [[:digit:]]+)*') + grep -E -m 1 'Fix coverity defects: CID [[:digit:]]+(, [[:digit:]]+)*') if [ -z "$subject" ]; then echo "error: Coverity defect fixes must have a subject line that starts with \"Fix coverity defects: CID dddd\"" error=1 @@ -174,8 +174,9 @@ function coverity_fix_commit() # test each summary line for the proper format OLDIFS=$IFS IFS=$'\n' - for line in $(git log -n 1 --pretty=%b "$REF" | egrep '^CID'); do - echo "$line" | egrep '^CID [[:digit:]]+: ([[:graph:]]+|[[:space:]])+ \(([[:upper:]]|\_)+\)' > /dev/null + for line in $(git log -n 1 --pretty=%b "$REF" | grep -E '^CID'); do + echo "$line" | grep -E '^CID [[:digit:]]+: ([[:graph:]]+|[[:space:]])+ \(([[:upper:]]|\_)+\)' > /dev/null + # shellcheck disable=SC2181 if [[ $? -ne 0 ]]; then echo "error: commit message has an improperly formatted CID defect line" error=1 diff --git a/scripts/zfs.sh b/scripts/zfs.sh index 8ece6ef5f..3cfb0c1f1 100755 --- a/scripts/zfs.sh +++ b/scripts/zfs.sh @@ -79,7 +79,7 @@ check_modules() { $KMOD_ZUNICODE $KMOD_ZCOMMON $KMOD_ICP $KMOD_ZFS; do NAME=$(basename "$KMOD" .ko) - if lsmod | egrep -q "^${NAME}"; then + if lsmod | grep -E -q "^${NAME}"; then LOADED_MODULES="$LOADED_MODULES\t$NAME\n" fi @@ -114,6 +114,7 @@ load_module() { fi $LDMOD "$KMOD" >/dev/null 2>&1 + # shellcheck disable=SC2181 if [ $? -ne 0 ]; then echo "Failed to load $KMOD" return 1 @@ -165,7 +166,7 @@ unload_modules() { for KMOD in $KMOD_ZFS $KMOD_ICP $KMOD_ZCOMMON $KMOD_ZUNICODE \ $KMOD_ZNVPAIR $KMOD_ZAVL $KMOD_SPLAT $KMOD_SPL; do NAME=$(basename "$KMOD" .ko) - USE_COUNT=$(lsmod | egrep "^${NAME} " | awk '{print $3}') + USE_COUNT=$(lsmod | grep -E "^${NAME} " | awk '{print $3}') if [ "$USE_COUNT" = "0" ] ; then unload_module "$KMOD" || return 1 diff --git a/scripts/zimport.sh b/scripts/zimport.sh index 36d4e6696..61c9aba4a 100755 --- a/scripts/zimport.sh +++ b/scripts/zimport.sh @@ -566,6 +566,7 @@ for TAG in $POOL_TAGS; do $ZPOOL_CMD import -N -d "$POOL_DIR_COPY" \ "$POOL_NAME" &>/dev/null + # shellcheck disable=SC2181 if [ $? -ne 0 ]; then fail_nonewline ERROR=1 diff --git a/scripts/zloop.sh b/scripts/zloop.sh index 2fcc807cd..4e0afac5b 100755 --- a/scripts/zloop.sh +++ b/scripts/zloop.sh @@ -70,12 +70,12 @@ function or_die # core file helpers origcorepattern="$(cat /proc/sys/kernel/core_pattern)" -coreglob="$(egrep -o '^([^|%[:space:]]*)' /proc/sys/kernel/core_pattern)*" +coreglob="$(grep -E -o '^([^|%[:space:]]*)' /proc/sys/kernel/core_pattern)*" if [[ $coreglob = "*" ]]; then echo "Setting core file pattern..." echo "core" > /proc/sys/kernel/core_pattern - coreglob="$(egrep -o '^([^|%[:space:]]*)' \ + coreglob="$(grep -E -o '^([^|%[:space:]]*)' \ /proc/sys/kernel/core_pattern)*" fi @@ -243,7 +243,7 @@ while [[ $timeout -eq 0 ]] || [[ $curtime -le $((starttime + timeout)) ]]; do echo "$desc" >>ztest.out $cmd >>ztest.out 2>&1 ztrc=$? - egrep '===|WARNING' ztest.out >>ztest.history + grep -E '===|WARNING' ztest.out >>ztest.history $ZDB -U "$workdir/zpool.cache" -DD ztest >>ztest.ddt 2>&1 store_core |