From d16d0d4f32622dc3f4ae7692c11075352c08c408 Mon Sep 17 00:00:00 2001
From: Kroese <kroese@users.noreply.github.com>
Date: Sun, 21 Sep 2025 15:06:09 +0200
Subject: [PATCH] fix: Simplify conditional checks

---
 src/disk.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/disk.sh b/src/disk.sh
index 7cd23df..a1cc680 100644
--- a/src/disk.sh
+++ b/src/disk.sh
@@ -596,16 +596,16 @@ DISK4_FILE="/storage4/${DISK_NAME}4"
 : "${DEVICE3:=""}"
 : "${DEVICE4:=""}"
 
-[ -z "$DEVICE" ] && [ -b "/disk" ] && DEVICE="/disk"
-[ -z "$DEVICE" ] && [ -b "/disk1" ] && DEVICE="/disk1"
-[ -z "$DEVICE2" ] && [ -b "/disk2" ] && DEVICE2="/disk2"
-[ -z "$DEVICE3" ] && [ -b "/disk3" ] && DEVICE3="/disk3"
-[ -z "$DEVICE4" ] && [ -b "/disk4" ] && DEVICE4="/disk4"
+[ -z "$DEVICE" && -b "/disk" ] && DEVICE="/disk"
+[ -z "$DEVICE" && -b "/disk1" ] && DEVICE="/disk1"
+[ -z "$DEVICE2" && -b "/disk2" ] && DEVICE2="/disk2"
+[ -z "$DEVICE3" && -b "/disk3" ] && DEVICE3="/disk3"
+[ -z "$DEVICE4" && -b "/disk4" ] && DEVICE4="/disk4"
 
-[ -z "$DEVICE" ] && [ -b "/dev/disk1" ] && DEVICE="/dev/disk1"
-[ -z "$DEVICE2" ] && [ -b "/dev/disk2" ] && DEVICE2="/dev/disk2"
-[ -z "$DEVICE3" ] && [ -b "/dev/disk3" ] && DEVICE3="/dev/disk3"
-[ -z "$DEVICE4" ] && [ -b "/dev/disk4" ] && DEVICE4="/dev/disk4"
+[ -z "$DEVICE" && -b "/dev/disk1" ] && DEVICE="/dev/disk1"
+[ -z "$DEVICE2" && -b "/dev/disk2" ] && DEVICE2="/dev/disk2"
+[ -z "$DEVICE3" && -b "/dev/disk3" ] && DEVICE3="/dev/disk3"
+[ -z "$DEVICE4" && -b "/dev/disk4" ] && DEVICE4="/dev/disk4"
 
 if [ -n "$DEVICE" ]; then
   addDevice "$DEVICE" "$DISK_TYPE" "3" "0xc" || exit $?