From 4bc04d0bdf913fa0efa3b6addd6c7ce46b77f424 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Fri, 7 Apr 2023 14:49:41 +0200
Subject: [PATCH] Refactor rclone remote installation

---
 scripts/Common/Config/rclone/InstallSync.sh  |  4 ++--
 scripts/Common/Config/rclone/install.sh      |  3 ++-
 scripts/Common/Config/rclone/rclone.service  | 12 ++++++++++++
 scripts/Common/Config/rclone/rclone@.service |  4 ++--
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 scripts/Common/Config/rclone/rclone.service

diff --git a/scripts/Common/Config/rclone/InstallSync.sh b/scripts/Common/Config/rclone/InstallSync.sh
index 1318715a..b2096599 100755
--- a/scripts/Common/Config/rclone/InstallSync.sh
+++ b/scripts/Common/Config/rclone/InstallSync.sh
@@ -6,6 +6,6 @@ serviceName="rclone@$provider:$dirname";
 echo "Please create a remote called \`$1\`";
 rclone config;
 
-mkdir -p "~/$dirname";
+mkdir -p ~/"$dirname";
 
-systemctl --user enable "$serviceName" --now;
+systemctl --user start "$serviceName";
diff --git a/scripts/Common/Config/rclone/install.sh b/scripts/Common/Config/rclone/install.sh
index 5e8acc90..a9166965 100755
--- a/scripts/Common/Config/rclone/install.sh
+++ b/scripts/Common/Config/rclone/install.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-sudo cp "${BASH_SOURCE%/*}/rclone@.service" /etc/systemd/user;
+sudo cp "${BASH_SOURCE%/*}/rclone.service" "${BASH_SOURCE%/*}/rclone@.service" /etc/systemd/user;
+systemctl enable --user rclone;
diff --git a/scripts/Common/Config/rclone/rclone.service b/scripts/Common/Config/rclone/rclone.service
new file mode 100644
index 00000000..42e87d88
--- /dev/null
+++ b/scripts/Common/Config/rclone/rclone.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=rclone Service Starter
+Documentation=man:rclone(1)
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=oneshot
+ExecStart=bash -c 'systemctl --user start rclone@*.service'
+
+[Install]
+WantedBy=default.target
diff --git a/scripts/Common/Config/rclone/rclone@.service b/scripts/Common/Config/rclone/rclone@.service
index 03a48907..9a07b5ad 100644
--- a/scripts/Common/Config/rclone/rclone@.service
+++ b/scripts/Common/Config/rclone/rclone@.service
@@ -20,5 +20,5 @@ ExecStart= \
             $target: "%h/$dirname"'
 ExecStop=bash -c '/bin/fusermount -zu "%h/${EXPRESSION#*":"}"'
 
-[Install]
-WantedBy=default.target
+Restart=always
+RestartSec=10