aboutsummaryrefslogtreecommitdiffstats
path: root/element-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'element-desktop')
-rwxr-xr-xelement-desktop/mount-element8
-rwxr-xr-xelement-desktop/umount-element7
2 files changed, 12 insertions, 3 deletions
diff --git a/element-desktop/mount-element b/element-desktop/mount-element
index 1d3c03c..7b3c6a7 100755
--- a/element-desktop/mount-element
+++ b/element-desktop/mount-element
@@ -1,9 +1,13 @@
#!/bin/dash
if mountpoint -q -- "${HOME}/.var/opt/element/ElementCrypt.d"; then
- printf '%s\n' 'mount-element: already mounted' >&2
+ printf '%s\n' 'mount-element: already mounted' >&2 || :
elif test -e /dev/mapper/ElementCrypt; then
- asroot env ELEMENT_DIR="${HOME}/.var/opt/element" sh -ec \
+ asroot=asroot
+ if ! isfg; then
+ asroot=gasroot
+ fi
+ $asroot env ELEMENT_DIR="${HOME}/.var/opt/element" sh -ec \
'mount -- /dev/mapper/ElementCrypt "${ELEMENT_DIR}/ElementCrypt.d"'
else
gpg --decrypt -- "${HOME}/.var/opt/element/ElementCrypt.key" | \
diff --git a/element-desktop/umount-element b/element-desktop/umount-element
index 44d425b..ddfc602 100755
--- a/element-desktop/umount-element
+++ b/element-desktop/umount-element
@@ -1,6 +1,11 @@
#!/bin/dash
-asroot env \
+asroot=asroot
+if ! isfg; then
+ asroot=gasroot
+fi
+
+$asroot env \
ELEMENT_DIR="${HOME}/.var/opt/element" \
ELEMENT_DEV="$(losetup | sed 's/\s\+/ /g' | cut -d ' ' -f 1,6 | \
sed -n 's#\(/[^ ]*\) '"$(realpath -- "${HOME}/.var/opt/element/ElementCrypt.img")"'$#\1#p' | sed 1q)" \