Create ~/.var/opt and move ~/.var/{element,signal,wire} into ~/.var/opt

Signed-off-by: Mattias Andrée <maandree@kth.se>

7 files changed, 23 insertions, 21 deletions

diff --git a/element-desktop/Makefile b/element-desktop/Makefile
index 90f12d9..60a7a78 100644
--- a/element-desktop/Makefile
+++ b/element-desktop/Makefile
@@ -2,10 +2,10 @@
 include ../common.mk
 
 install:
-	test -f ~/.var/element/ElementCrypt.img
-	test -f ~/.var/element/ElementCrypt.key
-	mkdir -p -- ~/.var/element/ElementCrypt.d
-	test -e ~/.config/Element || ln -sf -- ../.var/element/ElementCrypt.d/Element ~/.config/Element
+	test -f ~/.var/opt/element/ElementCrypt.img
+	test -f ~/.var/opt/element/ElementCrypt.key
+	mkdir -p -- ~/.var/opt/element/ElementCrypt.d
+	test -e ~/.config/Element || ln -sf -- ../.var/opt/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 5eada3e..5689df2 100644
--- a/element-desktop/bash-aliases
+++ b/element-desktop/bash-aliases
@@ -1,8 +1,8 @@
 # -*- shell-script -*-
 
 mount-element () {
-	gpg --decrypt ~/.var/element/ElementCrypt.key | \
-	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" ELEMENT_DIR=~/.var/element sh -ec '
+	gpg --decrypt ~/.var/opt/element/ElementCrypt.key | \
+	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" ELEMENT_DIR=~/.var/opt/element sh -ec '
 		device="$(losetup --show -f -P "${ELEMENT_DIR}/ElementCrypt.img")"
 		printf "%s\n" "${device}" > "${XDG_RUNTIME_DIR}/ElementCrypt"
 		cryptsetup -d - open "${device}" ElementCrypt
@@ -11,7 +11,7 @@ mount-element () {
 }
 
 umount-element () {
-	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" ELEMENT_DIR=~/.var/element sh -c '
+	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" ELEMENT_DIR=~/.var/opt/element sh -c '
 		umount "${ELEMENT_DIR}/ElementCrypt.d"
 		cryptsetup close ElementCrypt
 		losetup --detach "$(cat -- "${XDG_RUNTIME_DIR}/ElementCrypt")"
diff --git a/filesystem/Makefile b/filesystem/Makefile
index 456b51c..a074dc3 100644
--- a/filesystem/Makefile
+++ b/filesystem/Makefile
@@ -23,6 +23,7 @@ install:
 	ln -sf -- ../.cache ~/.config/.cache
 	ln -sf -- .var/cache ~/.cache
 	ln -sf -- .cache/.thumbnails ~/.thumbnails
+	mkdir -p -- ~/.var/opt
 	mkdir -p -- ~/.var/games
 	mkdir -p -- ~/.var/lib
 	mkdir -p -- ~/.var/mail
@@ -86,6 +87,7 @@ uninstall:
 	-rmdir -- ~/.config
 	-rmdir -- ~/.var/cache/.thumbnails
 	-rmdir -- ~/.var/cache
+	-rmdir -- ~/.var/opt
 	-rmdir -- ~/.var/games
 	-rmdir -- ~/.var/lib
 	-rmdir -- ~/.var/mail
diff --git a/signal-desktop/Makefile b/signal-desktop/Makefile
index 36108fd..2aa0c96 100644
--- a/signal-desktop/Makefile
+++ b/signal-desktop/Makefile
@@ -2,10 +2,10 @@
 include ../common.mk
 
 install:
-	test -f ~/.var/signal/SignalCrypt.img
-	test -f ~/.var/signal/SignalCrypt.key
-	mkdir -p -- ~/.var/signal/SignalCrypt.d
-	test -e ~/.config/Signal || ln -sf -- ../.var/signal/SignalCrypt.d/Signal ~/.config/Signal
+	test -f ~/.var/opt/signal/SignalCrypt.img
+	test -f ~/.var/opt/signal/SignalCrypt.key
+	mkdir -p -- ~/.var/opt/signal/SignalCrypt.d
+	test -e ~/.config/Signal || ln -sf -- ../.var/opt/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 1e7b01c..0404b2c 100644
--- a/signal-desktop/bash-aliases
+++ b/signal-desktop/bash-aliases
@@ -1,8 +1,8 @@
 # -*- shell-script -*-
 
 mount-signal () {
-	gpg --decrypt ~/.var/signal/SignalCrypt.key | \
-	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" SIGNAL_DIR=~/.var/signal sh -ec '
+	gpg --decrypt ~/.var/opt/signal/SignalCrypt.key | \
+	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" SIGNAL_DIR=~/.var/opt/signal sh -ec '
 		device="$(losetup --show -f -P "${SIGNAL_DIR}/SignalCrypt.img")"
 		printf "%s\n" "${device}" > "${XDG_RUNTIME_DIR}/SignalCrypt"
 		cryptsetup -d - open "${device}" SignalCrypt
@@ -11,7 +11,7 @@ mount-signal () {
 }
 
 umount-signal () {
-	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" SIGNAL_DIR=~/.var/signal sh -c '
+	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" SIGNAL_DIR=~/.var/opt/signal sh -c '
 		umount "${SIGNAL_DIR}/SignalCrypt.d"
 		cryptsetup close SignalCrypt
 		losetup --detach "$(cat -- "${XDG_RUNTIME_DIR}/SignalCrypt")"
diff --git a/wire-desktop/Makefile b/wire-desktop/Makefile
index 28fea15..41e4b5a 100644
--- a/wire-desktop/Makefile
+++ b/wire-desktop/Makefile
@@ -2,10 +2,10 @@
 include ../common.mk
 
 install:
-	test -f ~/.var/wire/WireCrypt.img
-	test -f ~/.var/wire/WireCrypt.key
-	mkdir -p -- ~/.var/wire/WireCrypt.d
-	test -e ~/.config/Wire || ln -sf -- ../.var/wire/WireCrypt.d/Wire ~/.config/Wire
+	test -f ~/.var/opt/wire/WireCrypt.img
+	test -f ~/.var/opt/wire/WireCrypt.key
+	mkdir -p -- ~/.var/opt/wire/WireCrypt.d
+	test -e ~/.config/Wire || ln -sf -- ../.var/opt/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 aa18143..09f4733 100644
--- a/wire-desktop/bash-aliases
+++ b/wire-desktop/bash-aliases
@@ -1,8 +1,8 @@
 # -*- shell-script -*-
 
 mount-wire () {
-	gpg --decrypt ~/.var/wire/WireCrypt.key | \
-	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/wire sh -ec '
+	gpg --decrypt ~/.var/opt/wire/WireCrypt.key | \
+	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/opt/wire sh -ec '
 		device="$(losetup --show -f -P "${WIRE_DIR}/WireCrypt.img")"
 		printf "%s\n" "${device}" > "${XDG_RUNTIME_DIR}/WireCrypt"
 		cryptsetup -d - open "${device}" WireCrypt
@@ -11,7 +11,7 @@ mount-wire () {
 }
 
 umount-wire () {
-	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/wire sh -c '
+	asroot env XDG_RUNTIME_DIR="${XDG_RUNTIME_DIR}" WIRE_DIR=~/.var/opt/wire sh -c '
 		umount "${WIRE_DIR}/WireCrypt.d"
 		cryptsetup close WireCrypt
 		losetup --detach "$(cat -- "${XDG_RUNTIME_DIR}/WireCrypt")"