Merge branch 'master' of https://github.com/The-King-of-Toasters/voidrice
This commit is contained in:
commit
74c6c4d6e7
2 changed files with 17 additions and 21 deletions
|
@ -1,25 +1,23 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# Gives a dmenu prompt to mount unmounted drives.
|
# Gives a dmenu prompt to mount unmounted drives.
|
||||||
# If they're in /etc/fstab, they'll be mounted automatically.
|
# If they're in /etc/fstab, they'll be mounted automatically.
|
||||||
# Otherwise, you'll be prompted to give a mountpoint from already existsing directories.
|
# Otherwise, you'll be prompted to give a mountpoint from already existsing directories.
|
||||||
# If you input a novel directory, it will prompt you to create that directory.
|
# If you input a novel directory, it will prompt you to create that directory.
|
||||||
|
|
||||||
pgrep -x dmenu && exit
|
pgrep -x dmenu && exit
|
||||||
|
COLS="name,type,size,mountpoint"
|
||||||
|
|
||||||
mountable=$(lsblk -lp | grep part | grep -v "t /" | awk '{print $1, "(" $4 ")"}')
|
drives="$(lsblk -rpo "$COLS" | awk '$2=="part"&&$4==""{printf "%s (%s)\n",$1,$3}')"
|
||||||
[[ "$mountable" = "" ]] && exit 1
|
[ -z "$drives" ] && exit 1
|
||||||
chosen=$(echo "$mountable" | dmenu -i -p "Mount which drive?" | awk '{print $1}')
|
chosen="$(echo "$drives" | dmenu -i -p "Mount which drive?" | awk '{print $1}')"
|
||||||
[[ "$chosen" = "" ]] && exit 1
|
[ -z "$chosen" ] && exit 1
|
||||||
sudo mount "$chosen" && exit 0
|
sudo mount "$chosen" && exit 0
|
||||||
# You may want to change the line below for more suggestions for mounting.
|
# You may want to change the line below for more suggestions for mounting.
|
||||||
# I.e. you can increase the depth of the search, or add directories.
|
# I.e. you can increase the depth of the search, or add directories.
|
||||||
# This will increase the load time briefly though.
|
# This will increase the load time briefly though.
|
||||||
dirs=$(find /mnt /media /mount /home -type d -maxdepth 5 2>/dev/null)
|
mp="$(find /mnt /media /mount /home -type d -maxdepth 5 2>/dev/null | dmenu -i -p "Type in mount point.")"
|
||||||
mountpoint=$(echo "$dirs" | dmenu -i -p "Type in mount point.")
|
[ "$mp" = "" ] && exit 1
|
||||||
[[ "$mountpoint" = "" ]] && exit 1
|
if [ ! -d "$mp" ]; then
|
||||||
if [[ ! -d "$mountpoint" ]]; then
|
mkdiryn=$(printf "No\\nYes" | dmenu -i -p "$mp does not exist. Create it?")
|
||||||
mkdiryn=$(echo -e "No\nYes" | dmenu -i -p "$mountpoint does not exist. Create it?")
|
[ "$mkdiryn" = "Yes" ] && sudo mkdir -p "$mp"
|
||||||
[[ "$mkdiryn" = Yes ]] && sudo mkdir -p "$mountpoint"
|
|
||||||
fi
|
fi
|
||||||
sudo mount $chosen $mountpoint && pgrep -x dunst && notify-send "$chosen mounted to $mountpoint."
|
sudo mount "$chosen" "$mp" && pgrep -x dunst && notify-send "$chosen mounted to $mp."
|
||||||
|
|
|
@ -1,14 +1,12 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
# A dmenu prompt to unmount drives.
|
# A dmenu prompt to unmount drives.
|
||||||
# Provides you with mounted partitions, select one to unmount.
|
# Provides you with mounted partitions, select one to unmount.
|
||||||
|
|
||||||
# Drives mounted at /, /boot and /home will not be options to unmount.
|
# Drives mounted at /, /boot and /home will not be options to unmount.
|
||||||
# This can be changed by modifying $exclusionregex.
|
# This can be changed by modifying the awk command in $drives.
|
||||||
|
COLS="name,type,size,mountpoint"
|
||||||
|
|
||||||
exclusionregex="\(/boot\|/home\|/\)$"
|
drives=$(lsblk -rpo "$COLS" | awk '$2=="part"&&$4!~/boot|home|SWAP/&&length($4)>1{printf "%s (%s) on %s\n",$1,$3,$4}')
|
||||||
drives=$(lsblk -lp | grep "t /" | grep -v "$exclusionregex" | awk '{print $1, "(" $4 ")", "on", $7}')
|
[ -z "$drives" ] && exit
|
||||||
[[ "$drives" = "" ]] && exit
|
|
||||||
chosen=$(echo "$drives" | dmenu -i -p "Unmount which drive?" | awk '{print $1}')
|
chosen=$(echo "$drives" | dmenu -i -p "Unmount which drive?" | awk '{print $1}')
|
||||||
[[ "$chosen" = "" ]] && exit
|
[ -z "$chosen" ] && exit
|
||||||
sudo umount $chosen && pgrep -x dunst && notify-send "$chosen unmounted."
|
sudo umount "$chosen" && pgrep -x dunst && notify-send "$chosen unmounted."
|
||||||
|
|
Loading…
Reference in a new issue