Index: scripts/usb_mount.sh
===================================================================
diff -u -r23bf46e34d0a6b72b8d0187812a4d3c26170ca6c -r33ce323edd28935192fdb15010fd51eaa610aa58
--- scripts/usb_mount.sh	(.../usb_mount.sh)	(revision 23bf46e34d0a6b72b8d0187812a4d3c26170ca6c)
+++ scripts/usb_mount.sh	(.../usb_mount.sh)	(revision 33ce323edd28935192fdb15010fd51eaa610aa58)
@@ -6,31 +6,49 @@
 # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 #
-# @file    unmountUSB.sh
+# @file    usb_mount.sh
 #
 # @author  (last)      Behrouz NematiPour
-# @date    (last)      11-May-2021
+# @date    (last)      15-Jan-2025
 # @author  (original)  Behrouz NematiPour
-# @date    (original)  11-May-2021
+# @date    (original)  15-Jan-2025
 #
 ############################################################################
 
-# $1 - usb device
-# $2 - usb drive
-# eg. sudo mount -o "noexec,sync,nodev,nosuid" /dev/sda1 /media/usb/
+# Description
+#   Trys to mount the given usb device in the usb drive/location.
+# Parameters
+#   $1: usb device full path
+#   $2: usb drive full path (mount point)
+# Retruns
+#   No specific response
+# Considerations 
+#   No specific considerations.
 
-USER=root # change to leahi after Cybersecurity implementation
-mkdir -p "$2"
-if [ $? 1= 0 ]; then
-  echo "usb mount point folder '$2' cannot be made."
-  exit 1001
-fi
+# sources
+. ./_errors_
+. ./_functions_
 
+# variables
+PARAM_COUNT=2
+USB_DEVICE="$(trim "$1")"
+USB_FOLDER="$(trim "$2")"
+
+USER=root # leahi - change to leahi user after Cybersecurity implementation
+
+# functions
+
+# checks
+check_param_count  "$#" "$PARAM_COUNT"
+check_empty_string "$USB_DEVICE" "$ERR_MTPARAM_USB_DEVICE"
+check_empty_string "$USB_FOLDER" "$ERR_MTPARAM_USB_FOLDER"
+
+mkdir -p "$USB_FOLDER"
+check_result "$?" "$ERR_CMDFAIL_USB_FOLDER_MAKE"
+
 sudo mount -o uid=${USER},gid=${USER},umask=077,noexec,sync,nodev,nosuid "$1" "$2"
-if [ $? != 0 ]; then
-  echo "usb device '$1' cannot be mounted."
-  exit 1002
-fi
+check_result "$?" "$ERR_CMDFAIL_USB_DEVICE_MOUNT"
 
+sleep 0.1
 echo ""
 exit 0
\ No newline at end of file