janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/shell: improve mount handling

This commit is contained in:
xeruf 2022-01-08 21:47:30 +01:00
parent 675304b919
commit 899b023b81
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.config/shell/functions
View File

@ -359,7 +359,6 @@ mvx() {
yadm add "$1" ".config/$1" 2>/dev/null yadm add "$1" ".config/$1" 2>/dev/null
} }
# Create directory and move into it # Create directory and move into it
mkcd() { mkcd() {
mkdir -p "$1" && cd "$1" mkdir -p "$1" && cd "$1"
@ -370,9 +369,10 @@ mkcd() {
umoul() { umoul() {
if test "$1" if test "$1"
then arg="$1" then arg="$1"
mountpoint="$(test -d "$arg" && realpath "$arg" || echo "${XDG_RUNTIME_DIR}/mnt/$arg")" mountpoint="$(test -d "$arg" && realpath "$arg" || echo "${MNT:-${XDG_RUNTIME_DIR}/mnt}/$arg")"
mountpoint "$mountpoint" 2>/dev/null || test -b "$mountpoint" || mountpoint "$mountpoint" 2>/dev/null || test -b "$mountpoint" ||
mountpoint="$(mount --show-labels | grep "$arg" | cut -d' ' -f3)" mountpoint="$(mount --show-labels | grep "$arg" | cut -d' ' -f3)"
test "$mountpoint" || return 1
else mountpoint="$PWD" else mountpoint="$PWD"
while test "$mountpoint" != "/"; do while test "$mountpoint" != "/"; do
mountpoint "$mountpoint" >/dev/null && break mountpoint "$mountpoint" >/dev/null && break

2
.local/bin/scripts/moul
View File

@ -11,7 +11,7 @@ then
exit $code exit $code
fi fi
if grep -e "LABEL=$arg[^\w/]" /etc/fstab if grep -e "^LABEL=$arg[^\w/]" /etc/fstab
then mount -L "$@"; exit $? then mount -L "$@"; exit $?
fi fi
if grep -e "[^\w=/]$arg[^\w/]" /etc/fstab if grep -e "[^\w=/]$arg[^\w/]" /etc/fstab

9
.local/bin/scripts/update-e2b Executable file
View File

@ -0,0 +1,9 @@
#!/bin/sh
# Update an Easy2Boot USB Stick after adding ISOs
# To be called with target as arg
dir="${1:-${MNT:-${XDG_RUNTIME_DIR}/mnt}/E2B}"
find "$dir" -name "*32-*.iso" -exec mv -v {} {}def32 \;
find "$dir" -name "*.iso" -exec mv -v {} {}def64 \;
drive=$(mount | grep "$dir" | cut -d' ' -f1)
sudo umount $drive
sudo udefrag $drive