diff options
Diffstat (limited to 'dmount')
| -rwxr-xr-x | dmount | 25 |
1 files changed, 5 insertions, 20 deletions
@@ -31,21 +31,6 @@ esac done IS_HFS="" -if [ -n "$WAYLAND_DISPLAY" ]; then - DMENU="tofi" - DEFARGS="-c $HOME/.config/tofi/themes/dmenu_vertical --prompt-text" -elif [ -n "$DISPLAY" ]; then - DMENU="dmenu" - DEFARGS="-l 10 -p" -else - error_msg "Can't tell if Wayland or Xorg; is there a display server?" -fi - -case "$DMENU" in - dmenu) PASSARG="-P" ;; - tofi) PASSARG="--hide-input=true" ;; -esac - check_crypto () { [ "$(lsblk -oFSTYPE "$1" | wc -l)" -gt 2 ] && printf "y" } @@ -55,8 +40,8 @@ is_crypto () { } unlock_crypto () { - NAME="$(cat /dev/null | $DMENU $DEFARGS "Name" $ARGS)" - PASSWORD="$(cat /dev/null | $DMENU $DEFARGS "Password" $PASSARG $ARGS)" + NAME="$(cat /dev/null | dmenu -l 15 -p "Name" $ARGS)" + PASSWORD="$(cat /dev/null | dmenu -l 15 -p "Password" $PASSARG $ARGS)" echo "$PASSWORD" | sudo cryptsetup open "$1" "$NAME" || FAILED="y" unset PASSWORD [ -n "$FAILED" ] && \ @@ -79,11 +64,11 @@ get_available () { lsblk -oPATH,SIZE,FSTYPE,MOUNTPOINT | tail -n+2 | while read getmount() { \ [ -z "$chosen" ] && exit 1 # shellcheck disable=SC2086 - mp="$(find $1 2>/dev/null | $DMENU $ARGS $DEFARGS "Type in mount point.")" || error_msg "Canceled; no mount point chosen." + mp="$(find $1 2>/dev/null | dmenu $ARGS -l 15 -p "Type in mount point.")" || error_msg "Canceled; no mount point chosen." test -z "$mp" && \ exit 1 if [ ! -d "$mp" ]; then - mkdiryn=$(printf "No\\nYes" | $DMENU $ARGS $DEFARGS "$mp does not exist. Create it?") || \ + mkdiryn=$(printf "No\\nYes" | dmenu $ARGS -l 15 -p "$mp does not exist. Create it?") || \ exit 1 [ "$mkdiryn" = "Yes" ] && (mkdir -p "$mp" || sudo mkdir -p "$mp") fi @@ -113,7 +98,7 @@ mount_device () { sudo mount $MOUNTARGS $MOUNTPROPS "$1" "$mp" && show "Mounted successfully\n" } -DEVICE="$(get_available | $DMENU $DEFARGS "Devices" $ARGS )" +DEVICE="$(get_available | dmenu -l 15 -p "Devices" $ARGS )" [ -z "$DEVICE" ] && exit 1 echo "$DEVICE" | grep -q "hfsplus" && IS_HFS="y" chosen="${DEVICE%% *}" |