diff options
Diffstat (limited to 'wire-desktop')
| -rw-r--r-- | wire-desktop/Makefile | 8 | ||||
| -rw-r--r-- | wire-desktop/bash-aliases | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/wire-desktop/Makefile b/wire-desktop/Makefile index 28fea15..41e4b5a 100644 --- a/wire-desktop/Makefile +++ b/wire-desktop/Makefile @@ -2,10 +2,10 @@ include ../common.mk install: - test -f ~/.var/wire/WireCrypt.img - test -f ~/.var/wire/WireCrypt.key - mkdir -p -- ~/.var/wire/WireCrypt.d - test -e ~/.config/Wire || ln -sf -- ../.var/wire/WireCrypt.d/Wire ~/.config/Wire + test -f ~/.var/opt/wire/WireCrypt.img + test -f ~/.var/opt/wire/WireCrypt.key + mkdir -p -- ~/.var/opt/wire/WireCrypt.d + test -e ~/.config/Wire || ln -sf -- ../.var/opt/wire/WireCrypt.d/Wire ~/.config/Wire $(CHECK_INSTALLED) asroot $(CHECK_INSTALLED) gnupg $(CHECK_INSTALLED) cryptsetup diff --git a/wire-desktop/bash-aliases b/wire-desktop/bash-aliases index aa18143..09f4733 100644 --- a/wire-desktop/bash-aliases +++ b/wire-desktop/bash-aliases @@ -1,8 +1,8 @@ # -*- shell-script -*- mount-wire () { - gpg --decrypt ~/.var/wire/WireCrypt.key | \ - asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/wire sh -ec ' + gpg --decrypt ~/.var/opt/wire/WireCrypt.key | \ + asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/opt/wire sh -ec ' device="$(losetup --show -f -P "${WIRE_DIR}/WireCrypt.img")" printf "%s\n" "${device}" > "${XDG_RUNTIME_DIR}/WireCrypt" cryptsetup -d - open "${device}" WireCrypt @@ -11,7 +11,7 @@ mount-wire () { } umount-wire () { - asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/wire sh -c ' + asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/opt/wire sh -c ' umount "${WIRE_DIR}/WireCrypt.d" cryptsetup close WireCrypt losetup --detach "$(cat -- "${XDG_RUNTIME_DIR}/WireCrypt")" |