tools/qmnt

@@ -135,20 +135,13 @@ if [[ "$#" -eq 0 ]]; then
     print_help
 fi
 
-EFF_UID="${EFF_UID:-$UID}"
-if [[ ! -z $SUDO_USER ]]; then
-    EFF_UID=$SUDO_UID
-elif [[ ! -z $DOAS_USER ]]; then
-    EFF_UID=$(id -u $DOAS_USER)
-fi
-
 for arg in "$@"; do
     case "${arg}" in
         "-h" | "--help")
             print_help
         ;;
         "-p" | "--permissions")
-            MOUNT_OPTS+=",uid=$EFF_UID,gid=$(id -g $EFF_UID)"
+            MOUNT_OPTS+=",uid=$UID,gid=$(id -g $UID)"
         ;;
         "-u" | "--uuid")
             ALLOW_UUID="1"
@@ -198,14 +191,12 @@ fi
 
 trap - EXIT
 
-
 if [[ -z "${DEFAULT_MOUNT_OPTS["$TYPE"]}" ]]; then
-    MOUNT_OPTS="${DEFAULT_MOUNT_OPTS["OTHER"]},${MOUNT_OPTS}"
+    MOUNT_OPTS="${DEFAULT_MOUNT_OPTS["OTHER"]}""${MOUNT_OPTS}"
 else
-    MOUNT_OPTS="${DEFAULT_MOUNT_OPTS["$TYPE"]},${MOUNT_OPTS}"
+    MOUNT_OPTS="${DEFAULT_MOUNT_OPTS["$TYPE"]}""${MOUNT_OPTS}"
 fi
 
-
 [[ ! -d "${MOUNT_FOLDER}" && -z $DRY_RUN ]] && mkdir "${MOUNT_FOLDER}"
 [[ ! -d "${MOUNT_FOLDER}/${LABEL}" && -z $DRY_RUN ]] && mkdir "${MOUNT_FOLDER}/${LABEL}"