aboutsummaryrefslogtreecommitdiffstats
path: root/wire-desktop
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--wire-desktop/Makefile2
-rw-r--r--wire-desktop/bash-aliases3
2 files changed, 3 insertions, 2 deletions
diff --git a/wire-desktop/Makefile b/wire-desktop/Makefile
index e6d821b..28fea15 100644
--- a/wire-desktop/Makefile
+++ b/wire-desktop/Makefile
@@ -5,7 +5,7 @@ install:
test -f ~/.var/wire/WireCrypt.img
test -f ~/.var/wire/WireCrypt.key
mkdir -p -- ~/.var/wire/WireCrypt.d
- test -e ~/.config/Wire || ln -s -- ../.var/wire/WireCrypt.d/Wire ~/.config/Wire
+ test -e ~/.config/Wire || ln -sf -- ../.var/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 00cd7a1..aa18143 100644
--- a/wire-desktop/bash-aliases
+++ b/wire-desktop/bash-aliases
@@ -1,10 +1,11 @@
# -*- shell-script -*-
mount-wire () {
+ gpg --decrypt ~/.var/wire/WireCrypt.key | \
asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/wire sh -ec '
device="$(losetup --show -f -P "${WIRE_DIR}/WireCrypt.img")"
printf "%s\n" "${device}" > "${XDG_RUNTIME_DIR}/WireCrypt"
- gpg --decrypt "${WIRE_DIR}/WireCrypt.key" | cryptsetup -d - open "${device}" WireCrypt
+ cryptsetup -d - open "${device}" WireCrypt
mount /dev/mapper/WireCrypt "${WIRE_DIR}/WireCrypt.d"
'
}