From 40a84318d0c64405b4b56f7a649225d37880e898 Mon Sep 17 00:00:00 2001
From: nachoparker <nacho@ownyourbits.com>
Date: Fri, 11 May 2018 13:27:24 +0200
Subject: nc-backup: make more robust to unexpected failure

---
 etc/ncp-config.d/nc-backup.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/etc/ncp-config.d/nc-backup.sh b/etc/ncp-config.d/nc-backup.sh
index 8ac7b118..f67cf00e 100644
--- a/etc/ncp-config.d/nc-backup.sh
+++ b/etc/ncp-config.d/nc-backup.sh
@@ -24,6 +24,7 @@ install()
 {
   cat > /usr/local/bin/ncp-backup <<'EOF'
 #!/bin/bash
+set -eE
 
 DESTDIR="${1:-/media/USBdrive/ncp-backups}"
 INCLUDEDATA="${2:-no}"
@@ -39,7 +40,13 @@ DATADIR=$( cd "$BASEDIR"/nextcloud; sudo -u www-data php occ config:system:get d
   exit 1;
 }
 
+cleanup(){  local RET=$?; echo "Cleanup..."; rm -f "${DBBACKUP}"              ; exit $RET; }
+fail()   {  local RET=$?; echo "Abort..."  ; rm -f "${DBBACKUP}" "${DESTFILE}"; exit $RET; }
+trap cleanup EXIT
+trap fail INT TERM HUP ERR
+
 echo "check free space..."
+mkdir -p "$DESTDIR"
 SIZE=$( du -s "$DATADIR" |           awk '{ print $1 }' )
 FREE=$( df    "$DESTDIR" | tail -1 | awk '{ print $4 }' )
 
-- 
cgit v1.2.3