Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

shellcheck pass 

note: which is non-standard. Use builtin 'command -v' instead. [SC2230]
note: Use -n instead of ! -z. [SC2236]

Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Giuseppe Di Natale <guss80@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: bunder2015 <omfgbunder@gmail.com>
Closes #8367
This commit is contained in:
bunder2015 2019-02-04 12:07:19 -05:00 committed by Brian Behlendorf
parent cca14128c9
commit bf6ca0a631
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zed/zed.d/statechange-led.sh
View File

@ -165,7 +165,7 @@ process_pool()
fi fi
} }
if [ ! -z "$ZEVENT_VDEV_ENC_SYSFS_PATH" ] && [ ! -z "$ZEVENT_VDEV_STATE_STR" ] ; then if [ -n "$ZEVENT_VDEV_ENC_SYSFS_PATH" ] && [ -n "$ZEVENT_VDEV_STATE_STR" ] ; then
# Got a statechange for an individual VDEV # Got a statechange for an individual VDEV
val=$(state_to_val "$ZEVENT_VDEV_STATE_STR") val=$(state_to_val "$ZEVENT_VDEV_STATE_STR")
vdev=$(basename "$ZEVENT_VDEV_PATH") vdev=$(basename "$ZEVENT_VDEV_PATH")

2
cmd/zed/zed.d/zed-functions.sh
View File

@ -434,7 +434,7 @@ zed_guid_to_pool()
fi fi
guid=$(printf "%llu" "$1") guid=$(printf "%llu" "$1")
if [ ! -z "$guid" ] ; then if [ -n "$guid" ] ; then
$ZPOOL get -H -ovalue,name guid | awk '$1=='"$guid"' {print $2}' $ZPOOL get -H -ovalue,name guid | awk '$1=='"$guid"' {print $2}'
fi fi
} }

6
cmd/zpool/zpool.d/smart
View File

@ -69,7 +69,7 @@ if [ "$1" = "-h" ] ; then
exit exit
fi fi
smartctl_path=$(which smartctl) smartctl_path=$(command -v smartctl)
if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then if [ -b "$VDEV_UPATH" ] && [ -x "$smartctl_path" ] || [ -n "$samples" ] ; then
if [ -n "$samples" ] ; then if [ -n "$samples" ] ; then
@ -228,7 +228,7 @@ smart_test)
esac esac
with_vals=$(echo "$out" | grep -E "$scripts") with_vals=$(echo "$out" | grep -E "$scripts")
if [ ! -z "$with_vals" ]; then if [ -n "$with_vals" ]; then
echo "$with_vals" echo "$with_vals"
without_vals=$(echo "$scripts" | tr "|" "\n" | without_vals=$(echo "$scripts" | tr "|" "\n" |
grep -v -E "$(echo "$with_vals" | grep -v -E "$(echo "$with_vals" |
@ -237,6 +237,6 @@ else
without_vals=$(echo "$scripts" | tr "|" "\n" | awk '{print $0"="}') without_vals=$(echo "$scripts" | tr "|" "\n" | awk '{print $0"="}')
fi fi
if [ ! -z "$without_vals" ]; then if [ -n "$without_vals" ]; then
echo "$without_vals" echo "$without_vals"
fi fi

4
scripts/zimport.sh
View File

@ -233,8 +233,8 @@ src_set_vars() {
ZFS_URL="$REPO/zfs/tarball/$ZFS_TAG" ZFS_URL="$REPO/zfs/tarball/$ZFS_TAG"
if [ "$TAG" = "installed" ]; then if [ "$TAG" = "installed" ]; then
ZPOOL_CMD=$(which zpool) ZPOOL_CMD=$(command -v zpool)
ZFS_CMD=$(which zfs) ZFS_CMD=$(command -v zfs)
ZFS_SH="/usr/share/zfs/zfs.sh" ZFS_SH="/usr/share/zfs/zfs.sh"
else else
ZPOOL_CMD="./cmd/zpool/zpool" ZPOOL_CMD="./cmd/zpool/zpool"