From 91bd92045e48a51456c211b0cd904cbb259b7479 Mon Sep 17 00:00:00 2001
From: Ryan Cavicchioni <ryan@cavi.cc>
Date: Fri, 27 Dec 2019 00:04:59 -0600
Subject: [PATCH] restic script fixes

---
 roles/restic/files/hooks/minecraft.sh | 12 ++++++++++++
 roles/restic/files/restic-job.sh      |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/roles/restic/files/hooks/minecraft.sh b/roles/restic/files/hooks/minecraft.sh
index a2c770b..036151b 100644
--- a/roles/restic/files/hooks/minecraft.sh
+++ b/roles/restic/files/hooks/minecraft.sh
@@ -1,10 +1,20 @@
 #!/bin/bash
 
+set -e
+
 SERVICE=minecraft.service
 VAR_DIR=/opt/minecraft/var
 WAIT=30
 VERBOSE=${VERBOSE:-4}
 
+prereq() {
+    local service=$1
+    if ! systemctl list-units --full --all | grep -Fq "$service"; then
+        printf "%s unit does not exit\n" "$service"
+        exit 1
+    fi
+}
+
 error_exit() {
     printf "%s\n" "$1" >&2
     exit 1
@@ -75,6 +85,8 @@ open_files() {
 
 
 main() {
+    prereq "$SERVICE"
+
     if [ "$1" == "pre" ]; then
         printf "stopping %s\n" $SERVICE
         if ! stop_server $SERVICE; then
diff --git a/roles/restic/files/restic-job.sh b/roles/restic/files/restic-job.sh
index 0df8f6f..014fbb5 100755
--- a/roles/restic/files/restic-job.sh
+++ b/roles/restic/files/restic-job.sh
@@ -64,6 +64,7 @@ counter=0
 sleep=1
 rc=1
 
+printf "restic started\n"
 until [ $counter -eq "$MAX_ATTEMPTS" ] || [ $rc -eq 0 ]; do
     if [ -r "$EXCLUDE_PATH" ]; then
         $NICE "$RESTIC_PATH" backup -q --exclude-file="${EXCLUDE_PATH}" "${PATHS}"
@@ -81,6 +82,7 @@ until [ $counter -eq "$MAX_ATTEMPTS" ] || [ $rc -eq 0 ]; do
 
     (( counter++ ))
 done
+printf "restic complete\n"
 
 if [ $rc -ne 0 ] && [ $counter -eq "$MAX_ATTEMPTS" ]; then
   printf "restic job timed out, exiting\n"