summaryrefslogtreecommitdiff
path: root/scripts/fsadm.sh
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2017-06-28 16:13:29 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2017-06-29 22:23:16 +0200
commit95ca7cfdffc5052e360d76c787a601e9aa626bd1 (patch)
tree123d6a1464ac9de9e2a4f2ecdc898c0c0d5f4a5d /scripts/fsadm.sh
parentc6a5964ce96e869028394fb31060d2e2c44c2ab1 (diff)
downloadlvm2-95ca7cfdffc5052e360d76c787a601e9aa626bd1.tar.gz
fsadm: make if statement more clear
Diffstat (limited to 'scripts/fsadm.sh')
-rwxr-xr-xscripts/fsadm.sh8
1 files changed, 5 insertions, 3 deletions
diff --git a/scripts/fsadm.sh b/scripts/fsadm.sh
index 0db24ad04..e08862ad7 100755
--- a/scripts/fsadm.sh
+++ b/scripts/fsadm.sh
@@ -111,7 +111,7 @@ tool_usage() {
}
verbose() {
- test -n "$VERB" && echo "$TOOL:" "$@" || true
+ test -z "$VERB" || echo "$TOOL:" "$@"
}
# Support multi-line error messages
@@ -423,7 +423,9 @@ try_umount() {
}
validate_parsing() {
- test -n "$BLOCKSIZE" && test -n "$BLOCKCOUNT" || error "Cannot parse $1 output."
+ if test -z "$BLOCKSIZE" || test -z "$BLOCKCOUNT" ; then
+ error "Cannot parse $1 output."
+ fi
}
####################################
# Resize ext2/ext3/ext4 filesystem
@@ -445,7 +447,7 @@ resize_ext() {
decode_size "$1" "$BLOCKSIZE"
FSFORCE=$FORCE
- if [ "$NEWBLOCKCOUNT" -lt "$BLOCKCOUNT" -o "$EXTOFF" -eq 1 ]; then
+ if test "$NEWBLOCKCOUNT" -lt "$BLOCKCOUNT" || test "$EXTOFF" -eq 1 ; then
test "$IS_MOUNTED" -eq 1 && verbose "$RESIZE_EXT needs unmounted filesystem" && try_umount
REMOUNT=$MOUNTED
if test -n "$MOUNTED" ; then