diff options
Diffstat (limited to '')
| -rwxr-xr-x | element-desktop/mount-element | 6 | ||||
| -rwxr-xr-x | element-desktop/umount-element | 7 | ||||
| -rwxr-xr-x | signal-desktop/mount-signal | 6 | ||||
| -rwxr-xr-x | signal-desktop/umount-signal | 7 | ||||
| -rwxr-xr-x | wire-desktop/mount-wire | 6 | ||||
| -rwxr-xr-x | wire-desktop/umount-wire | 7 |
6 files changed, 33 insertions, 6 deletions
diff --git a/element-desktop/mount-element b/element-desktop/mount-element index 1d3c03c..311d6ea 100755 --- a/element-desktop/mount-element +++ b/element-desktop/mount-element @@ -3,7 +3,11 @@ if mountpoint -q -- "${HOME}/.var/opt/element/ElementCrypt.d"; then 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)" \ diff --git a/signal-desktop/mount-signal b/signal-desktop/mount-signal index 6754d0f..4c3e10c 100755 --- a/signal-desktop/mount-signal +++ b/signal-desktop/mount-signal @@ -3,7 +3,11 @@ if mountpoint -q -- "${HOME}/.var/opt/signal/SignalCrypt.d"; then printf '%s\n' 'mount-signal: already mounted' >&2 elif test -e /dev/mapper/SignalCrypt; then - asroot env SIGNAL_DIR="${HOME}/.var/opt/signal" sh -ec \ + asroot=asroot + if ! isfg; then + asroot=gasroot + fi + $asroot env SIGNAL_DIR="${HOME}/.var/opt/signal" sh -ec \ 'mount -- /dev/mapper/SignalCrypt "${SIGNAL_DIR}/SignalCrypt.d"' else gpg --decrypt -- "${HOME}/.var/opt/signal/SignalCrypt.key" | \ diff --git a/signal-desktop/umount-signal b/signal-desktop/umount-signal index 06a4eef..c342fbb 100755 --- a/signal-desktop/umount-signal +++ b/signal-desktop/umount-signal @@ -1,6 +1,11 @@ #!/bin/dash -asroot env \ +asroot=asroot +if ! isfg; then + asroot=gasroot +fi + +$asroot env \ SIGNAL_DIR="${HOME}/.var/opt/signal" \ SIGNAL_DEV="$(losetup | sed 's/\s\+/ /g' | cut -d ' ' -f 1,6 | \ sed -n 's#\(/[^ ]*\) '"$(realpath -- "${HOME}/.var/opt/signal/SignalCrypt.img")"'$#\1#p' | sed 1q)" \ diff --git a/wire-desktop/mount-wire b/wire-desktop/mount-wire index a6dde57..776792c 100755 --- a/wire-desktop/mount-wire +++ b/wire-desktop/mount-wire @@ -3,7 +3,11 @@ if mountpoint -q -- "${HOME}/.var/opt/wire/WireCrypt.d"; then printf '%s\n' 'mount-wire: already mounted' >&2 elif test -e /dev/mapper/WireCrypt; then - asroot env WIRE_DIR="${HOME}/.var/opt/wire" sh -ec \ + asroot=asroot + if ! isfg; then + asroot=gasroot + fi + $asroot env WIRE_DIR="${HOME}/.var/opt/wire" sh -ec \ 'mount -- /dev/mapper/WireCrypt "${WIRE_DIR}/WireCrypt.d"' else gpg --decrypt -- "${HOME}/.var/opt/wire/WireCrypt.key" | \ diff --git a/wire-desktop/umount-wire b/wire-desktop/umount-wire index 796ea05..ce7f0c0 100755 --- a/wire-desktop/umount-wire +++ b/wire-desktop/umount-wire @@ -1,6 +1,11 @@ #!/bin/dash -asroot env \ +asroot=asroot +if ! isfg; then + asroot=gasroot +fi + +$asroot env \ WIRE_DIR="${HOME}/.var/opt/wire" \ WIRE_DEV="$(losetup | sed 's/\s\+/ /g' | cut -d ' ' -f 1,6 | \ sed -n 's#\(/[^ ]*\) '"$(realpath -- "${HOME}/.var/opt/wire/WireCrypt.img")"'$#\1#p' | sed 1q)" \ |