diff options
Diffstat (limited to '')
| -rw-r--r-- | element-desktop/Makefile | 2 | ||||
| -rw-r--r-- | element-desktop/bash-aliases | 3 | ||||
| -rw-r--r-- | java-runtime/Makefile | 2 | ||||
| -rw-r--r-- | libcontacts/Makefile | 2 | ||||
| -rw-r--r-- | rotd/Makefile | 2 | ||||
| -rw-r--r-- | signal-desktop/Makefile | 2 | ||||
| -rw-r--r-- | signal-desktop/bash-aliases | 3 | ||||
| -rw-r--r-- | wire-desktop/Makefile | 2 | ||||
| -rw-r--r-- | wire-desktop/bash-aliases | 3 |
9 files changed, 12 insertions, 9 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" ' } diff --git a/java-runtime/Makefile b/java-runtime/Makefile index 8376e5e..2098676 100644 --- a/java-runtime/Makefile +++ b/java-runtime/Makefile @@ -7,7 +7,7 @@ install: test ! -e ~/.java ln -s -- .var/cache/java ~/.java mkdir -p -- ~/.config/profile.d - test ! d ~/.config/profile.d/java-runtime + test ! -d ~/.config/profile.d/java-runtime ln -sf -- ~/.dotfiles/java-runtime/user-profile ~/.config/profile.d/java-runtime uninstall: diff --git a/libcontacts/Makefile b/libcontacts/Makefile index f73de4d..1f246e3 100644 --- a/libcontacts/Makefile +++ b/libcontacts/Makefile @@ -8,7 +8,7 @@ install: test ! -e ~/.config/contacts && \ ln -sf -- ~/.dotfiles/libcontacts/contacts ~/.config/contacts; \ else \ - test "$(readlink ~/.config/contacts)" = ~/.dotfiles/libcontacts/contacts; \ + test "$$(readlink -- ~/.config/contacts)" = ~/.dotfiles/libcontacts/contacts; \ fi uninstall: diff --git a/rotd/Makefile b/rotd/Makefile index db96d92..a292658 100644 --- a/rotd/Makefile +++ b/rotd/Makefile @@ -8,7 +8,7 @@ install: test ! -e ~/.config/rotd && \ ln -sf -- ~/.dotfiles/rotd/config ~/.config/rotd; \ else \ - test "$(readlink ~/.config/rotd)" = ~/.dotfiles/rotd/config; \ + test "$$(readlink -- ~/.config/rotd)" = ~/.dotfiles/rotd/config; \ fi uninstall: diff --git a/signal-desktop/Makefile b/signal-desktop/Makefile index c0da6aa..36108fd 100644 --- a/signal-desktop/Makefile +++ b/signal-desktop/Makefile @@ -5,7 +5,7 @@ install: test -f ~/.var/signal/SignalCrypt.img test -f ~/.var/signal/SignalCrypt.key mkdir -p -- ~/.var/signal/SignalCrypt.d - test -e ~/.config/Signal || ln -s -- ../.var/signal/SignalCrypt.d/Signal ~/.config/Signal + test -e ~/.config/Signal || ln -sf -- ../.var/signal/SignalCrypt.d/Signal ~/.config/Signal $(CHECK_INSTALLED) asroot $(CHECK_INSTALLED) gnupg $(CHECK_INSTALLED) cryptsetup diff --git a/signal-desktop/bash-aliases b/signal-desktop/bash-aliases index 34a23b9..1e7b01c 100644 --- a/signal-desktop/bash-aliases +++ b/signal-desktop/bash-aliases @@ -1,10 +1,11 @@ # -*- shell-script -*- mount-signal () { + gpg --decrypt ~/.var/signal/SignalCrypt.key | \ asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" SIGNAL_DIR=~/.var/signal sh -ec ' device="$(losetup --show -f -P "${SIGNAL_DIR}/SignalCrypt.img")" printf "%s\n" "${device}" > "${XDG_RUNTIME_DIR}/SignalCrypt" - gpg --decrypt "${SIGNAL_DIR}/SignalCrypt.key" | cryptsetup -d - open "${device}" SignalCrypt + cryptsetup -d - open "${device}" SignalCrypt mount /dev/mapper/SignalCrypt "${SIGNAL_DIR}/SignalCrypt.d" ' } 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" ' } |