From 81daf417d87d2a1658635e2537985942f98757f5 Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Tue, 28 Jan 2020 00:06:49 -0600
Subject: [PATCH] fix issues with restic minecraft hook

---
 roles/restic/files/hooks/minecraft.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/roles/restic/files/hooks/minecraft.sh b/roles/restic/files/hooks/minecraft.sh
index 5657708..da8d175 100644
--- a/roles/restic/files/hooks/minecraft.sh
+++ b/roles/restic/files/hooks/minecraft.sh
@@ -24,11 +24,17 @@ stop_server() {
     local unit="${1:-$SERVICE}"
     local attempts="${2:-$WAIT}"
 
+    if ! systemctl -q is-enabled "$unit"; then
+        printf "%s is not enabled, skipping.\n" "$unit"
+        return 0
+    fi
+
     if ! systemctl -q is-active "$unit"; then
         printf "%s is already stopped\n" "$unit"
         return 0
     fi
 
+    printf "stopping %s\n" "$instance"
     systemctl -q stop "$unit"
 
     while systemctl -q is-active "$unit"; do
@@ -57,6 +63,7 @@ start_server() {
         return 0
     fi
 
+    printf "starting %s\n" "$instance"
     systemctl -q start "$unit"
 
     while ! systemctl -q is-active "$unit"; do
@@ -94,8 +101,6 @@ main() {
     if [ "$1" == "pre" ]; then
         for path in "$VAR_DIR"/*; do
             instance="minecraft@$(basename "$path").service"
-            prereq "$instance"
-            printf "stopping %s\n" "$instance"
             if ! stop_server "$instance"; then
                 error_exit "Failed to stop $instance"
             fi
@@ -108,8 +113,6 @@ main() {
     elif [ "$1" == "post" ]; then
         for path in "$VAR_DIR"/*; do
             instance="minecraft@$(basename "$path").service"
-            prereq "$instance"
-            printf "starting %s\n" "$instance"
             if ! start_server "$instance"; then
                 error_exit "Failed to start $instance"
             fi