mirror of
https://github.com/Llewellynvdm/Tomb.git
synced 2024-11-22 12:35:13 +00:00
Merge pull request #294 from dyne/regex-match
drop zsh/regex module in favor of =~
This commit is contained in:
commit
742b097192
3
tomb
3
tomb
@ -65,7 +65,6 @@ WIPE=(rm -f)
|
|||||||
PINENTRY=(pinentry)
|
PINENTRY=(pinentry)
|
||||||
|
|
||||||
# load zsh regex module
|
# load zsh regex module
|
||||||
zmodload zsh/regex
|
|
||||||
zmodload zsh/mapfile
|
zmodload zsh/mapfile
|
||||||
zmodload -F zsh/stat b:zstat
|
zmodload -F zsh/stat b:zstat
|
||||||
|
|
||||||
@ -2680,7 +2679,7 @@ umount_tomb() {
|
|||||||
tombname_regex=${tombname//\[/}
|
tombname_regex=${tombname//\[/}
|
||||||
tombname_regex=${tombname_regex//\]/}
|
tombname_regex=${tombname_regex//\]/}
|
||||||
|
|
||||||
[[ "$tombmount" -regex-match "[/run]?/media[/$_USER]?/$tombname_regex" ]] && {
|
[[ "$tombmount" =~ "(/run)?/media(/$_USER)?/$tombname_regex" ]] && {
|
||||||
_sudo rmdir $tombmount }
|
_sudo rmdir $tombmount }
|
||||||
|
|
||||||
_sudo cryptsetup luksClose $mapper ||
|
_sudo cryptsetup luksClose $mapper ||
|
||||||
|
Loading…
Reference in New Issue
Block a user