From 44cad425a41261a1f23681cacc8f86e7ea1a0eed Mon Sep 17 00:00:00 2001
From: Logan Gartner <logan@qtechofficial.com>
Date: Wed, 25 Sep 2024 12:46:03 -0600
Subject: [PATCH] qmnt - Added checks to see if partition is already mounted,
 or mountpoint occupied

---
 tools/qmnt | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tools/qmnt b/tools/qmnt
index 8e42d43..fe996f3 100755
--- a/tools/qmnt
+++ b/tools/qmnt
@@ -189,9 +189,12 @@ fi
 
 
 if [[ -z $DRY_RUN ]]; then
-    if ! mount -o "${MOUNT_OPTS}" --source "${TARGET}" --target "${MOUNT_FOLDER}/${LABEL}"; then
-        echo -e "\e[1;31mFailed to mount \"${TARGET}\"!""\e[0m" 1>&2
-        exit 1
+    if \
+        mountpoint "${MOUNT_FOLDER}/${LABEL}" 2>&1 &>/dev/null || \
+        findmnt -n -o SOURCE "${TARGET}" 2>&1 &>/dev/null || \
+        ! mount -o "${MOUNT_OPTS}" --source "${TARGET}" --target "${MOUNT_FOLDER}/${LABEL}"; then
+            echo -e "\e[1;31mFailed to mount \"${TARGET}\"!""\e[0m" 1>&2
+            exit 1
     fi
 
     (