fix - rclone upgrade, and added function

scripts/install/rclone.sh

@@ -17,28 +17,27 @@
 #   including (via compiler) GPL-licensed code must also be made available
 #   under the GPL along with build & install instructions.
 
-# Install fuse
-apt_install fuse
-sed -i -e 's/#user_allow_other/user_allow_other/' /etc/fuse.conf
+#shellcheck source=sources/functions/utils
+. /etc/swizzin/sources/functions/utils
+#shellcheck source=sources/functions/rclone
+. /etc/swizzin/sources/functions/rclone
 
-echo_progress_start "Downloading and installing rclone"
-# One-liner to check arch/os type, as well as download latest rclone for relevant system.
-wget -q https://rclone.org/install.sh -O /tmp/rcloneinstall.sh >> $log 2>&1
+_systemd() {
+    type="simple"
+    if [[ $(systemctl --version | awk 'NR==1 {print $2}') -ge 240 ]]; then
+        type="exec"
+    else
+        type="simple"
+    fi
 
-# Make sure rclone downloads and installs without error before proceeding
-if ! bash /tmp/rcloneinstall.sh; then
-    echo_error "Rclone installer failed"
-    exit 1
-fi
-
-echo_progress_start "Adding rclone multi-user mount service"
-cat > /etc/systemd/system/rclone@.service << EOF
+    echo_progress_start "Installing Systemd service"
+    cat > /etc/systemd/system/rclone@.service << EOF
 [Unit]
 Description=rclonemount
 After=network.target
 
 [Service]
-Type=simple
+Type=${type}
 User=%i
 Group=%i
 ExecStartPre=-/bin/mkdir -p /home/%i/cloud/
@@ -63,9 +62,13 @@ StartLimitBurst=3
 
 [Install]
 WantedBy=multi-user.target
-
 EOF
-echo_progress_done
+
+    echo_progress_done
+}
+
+_rclone_download_latest
+_systemd
 
 touch /install/.rclone.lock
 echo_success "Rclone installed"

scripts/upgrade/rclone.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+# rclone upgrader
+# byte 2022 for Swizzin
+
+#shellcheck source=sources/functions/utils
+. /etc/swizzin/sources/functions/utils
+#shellcheck source=sources/functions/rclone
+. /etc/swizzin/sources/functions/rclone
+
+if [[ ! -f /install/.rclone.lock ]]; then
+    echo_error "rclone doesn't appear to be installed!"
+    exit 1
+fi
+
+_restart_rclone() {
+    systemctl try-restart "rclone@"
+    echo_progress_done "Service restarted"
+}
+
+_rclone_download_latest
+_restart_rclone
+
+echo_success "rclone upgraded"

sources/functions/rclone

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Install fuse
+function _fuse() {
+    apt_install fuse
+    sed -i -e 's/#user_allow_other/user_allow_other/' /etc/fuse.conf
+}
+
+function _rclone_download_latest() {
+    echo_progress_start "Downloading and installing rclone"
+    # One-liner to check arch/os type, as well as download latest rclone for relevant system.
+    wget -q https://rclone.org/install.sh -O /tmp/rcloneinstall.sh >> "${log}" 2>&1
+
+    # Make sure rclone downloads and installs without error before proceeding
+    if ! bash /tmp/rcloneinstall.sh; then
+        echo_error "Rclone installer failed"
+        exit 1
+    fi
+}