diff options
| author | Giuseppe Di Natale <[email protected]> | 2017-09-18 14:23:09 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-09-18 14:23:09 -0700 |
| commit | ea49beba66106dcb272b43323fad147df1df13fd (patch) | |
| tree | 968b728491e8db5d289f2084253b4ce0944a083d /scripts/zimport.sh | |
| parent | a35b4cc8cca6eed5e93d54aa9ca2c72273a8943b (diff) | |
Correct shellcheck errors
The ZFS buildbot moved to using Ubuntu 17.04 for the
STYLE builder which has a newer version of shellcheck.
Correct the new issues it discovers.
Reviewed-by: loli10K <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Giuseppe Di Natale <[email protected]>
Closes #6647
Diffstat (limited to 'scripts/zimport.sh')
| -rwxr-xr-x | scripts/zimport.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/zimport.sh b/scripts/zimport.sh index c72a4a4e4..36d4e6696 100755 --- a/scripts/zimport.sh +++ b/scripts/zimport.sh @@ -286,7 +286,7 @@ pool_create() { src_set_vars "$1" if [ "$POOL_TAG" != "installed" ]; then - cd "$POOL_DIR_SRC" + cd "$POOL_DIR_SRC" || fail "Failed 'cd $POOL_DIR_SRC'" fi $ZFS_SH zfs="spa_config_path=$POOL_DIR_PRISTINE" || \ @@ -406,7 +406,7 @@ for TAG in $SRC_TAGS; do elif [ "$SPL_TAG" = "installed" ]; then skip_nonewline else - cd "$SRC_DIR" + cd "$SRC_DIR" || fail "Failed 'cd $SRC_DIR'" if [ ! -d "$SRC_DIR_SPL" ]; then mkdir -p "$SRC_DIR_SPL" @@ -443,7 +443,7 @@ for TAG in $SRC_TAGS; do elif [ "$ZFS_TAG" = "installed" ]; then skip_nonewline else - cd "$SRC_DIR" + cd "$SRC_DIR" || fail "Failed 'cd $SRC_DIR'" if [ ! -d "$SRC_DIR_ZFS" ]; then mkdir -p "$SRC_DIR_ZFS" @@ -477,7 +477,7 @@ for TAG in $SRC_TAGS; do elif [ "$SPL_TAG" = "installed" ]; then skip_nonewline else - cd "$SPL_DIR" + cd "$SPL_DIR" || fail "Failed 'cd $SPL_DIR'" make distclean &>/dev/null ./autogen.sh >>"$CONFIG_LOG" 2>&1 || \ fail "Failed SPL 'autogen.sh'" @@ -502,7 +502,7 @@ for TAG in $SRC_TAGS; do elif [ "$ZFS_TAG" = "installed" ]; then skip_nonewline else - cd "$ZFS_DIR" + cd "$ZFS_DIR" || fail "Failed 'cd $ZFS_DIR'" make distclean &>/dev/null ./autogen.sh >>"$CONFIG_LOG" 2>&1 || \ fail "Failed ZFS 'autogen.sh'" @@ -545,16 +545,16 @@ for TAG in $POOL_TAGS; do fi # Verify 'zpool import' works for all listed source versions. - for TAG in $SRC_TAGS; do + for SRC_TAG in $SRC_TAGS; do if [ $SKIP -eq 1 ]; then skip_nonewline continue fi - src_set_vars "$TAG" - if [ "$TAG" != "installed" ]; then - cd "$ZFS_DIR" + src_set_vars "$SRC_TAG" + if [ "$SRC_TAG" != "installed" ]; then + cd "$ZFS_DIR" || fail "Failed 'cd $ZFS_DIR'" fi $ZFS_SH zfs="spa_config_path=$POOL_DIR_COPY" |