diff options
| author | Mattias Andrée <maandree@kth.se> | 2021-06-25 19:14:42 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@kth.se> | 2021-06-25 19:14:42 +0200 |
| commit | c1b82c1353a4813ed8ddd1cfe95404131acb0609 (patch) | |
| tree | 2b10c504b6308916015425616a91a7e49a95c09a /element-desktop | |
| parent | Fix bugs (diff) | |
| download | dotfiles-c1b82c1353a4813ed8ddd1cfe95404131acb0609.tar.gz dotfiles-c1b82c1353a4813ed8ddd1cfe95404131acb0609.tar.bz2 dotfiles-c1b82c1353a4813ed8ddd1cfe95404131acb0609.tar.xz | |
Fix bugs
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
| -rw-r--r-- | element-desktop/Makefile | 2 | ||||
| -rw-r--r-- | element-desktop/bash-aliases | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/element-desktop/Makefile b/element-desktop/Makefile index 6426e83..90f12d9 100644 --- a/element-desktop/Makefile +++ b/element-desktop/Makefile @@ -5,7 +5,7 @@ install: test -f ~/.var/element/ElementCrypt.img test -f ~/.var/element/ElementCrypt.key mkdir -p -- ~/.var/element/ElementCrypt.d - test -e ~/.config/Element || ln -s -- ../.var/element/ElementCrypt.d/Element ~/.config/Element + test -e ~/.config/Element || ln -sf -- ../.var/element/ElementCrypt.d/Element ~/.config/Element $(CHECK_INSTALLED) asroot $(CHECK_INSTALLED) gnupg $(CHECK_INSTALLED) cryptsetup diff --git a/element-desktop/bash-aliases b/element-desktop/bash-aliases index b58dfbd..5eada3e 100644 --- a/element-desktop/bash-aliases +++ b/element-desktop/bash-aliases @@ -1,10 +1,11 @@ # -*- shell-script -*- mount-element () { + gpg --decrypt ~/.var/element/ElementCrypt.key | \ asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" ELEMENT_DIR=~/.var/element sh -ec ' device="$(losetup --show -f -P "${ELEMENT_DIR}/ElementCrypt.img")" printf "%s\n" "${device}" > "${XDG_RUNTIME_DIR}/ElementCrypt" - gpg --decrypt "${ELEMENT_DIR}/ElementCrypt.key" | cryptsetup -d - open "${device}" ElementCrypt + cryptsetup -d - open "${device}" ElementCrypt mount /dev/mapper/ElementCrypt "${ELEMENT_DIR}/ElementCrypt.d" ' } |