druckdev/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vim:funcs:crypt-*mount: Split local declarations

Browse Source 
Split up local declarations into definition and declaration to get the
exit code of the command substitution.
With `err_return` the function now aborts early if `$mount_point`
couldn't be set properly.
This commit is contained in:
druckdev
2022-01-29 23:30:59 +01:00
parent 546b37681f
commit e9c4d7f608
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.config/zsh/zshrc.d/40-functions.zsh
View File

@@ -257,10 +257,13 @@ crypt-mount() {
[[ $# -gt 0 ]] [[ $# -gt 0 ]]
[[ -b "$1" ]] [[ -b "$1" ]]
local name=crypt_"${1##*/}" local name mount_point
name=crypt_"${1##*/}"
sudo cryptsetup open "$1" "$name" sudo cryptsetup open "$1" "$name"
udisksctl mount -b /dev/mapper/"$name" udisksctl mount -b /dev/mapper/"$name"
local mount_point="$(
mount_point="$(
findmnt -lo SOURCE,TARGET \ findmnt -lo SOURCE,TARGET \
| grep -F /dev/mapper/"$name" \ | grep -F /dev/mapper/"$name" \
| awk '{ print $2; }' | awk '{ print $2; }'
@@ -281,7 +284,8 @@ crypt-umount() {
sync sync
local name=crypt_"${1##*/}" local name mount_point
name=crypt_"${1##*/}"
if if
mount | grep -q /dev/mapper/"$name" \ mount | grep -q /dev/mapper/"$name" \
@@ -296,7 +300,7 @@ crypt-umount() {
fi fi
udisksctl power-off -b "$1" udisksctl power-off -b "$1"
local mount_point="$( mount_point="$(
findmnt -lo SOURCE,TARGET \ findmnt -lo SOURCE,TARGET \
| grep -F /dev/mapper/"$name" \ | grep -F /dev/mapper/"$name" \
| awk '{ print $2; }' | awk '{ print $2; }'