From a35edebafc35e6a228cd37fe905d4392e0b02f50 Mon Sep 17 00:00:00 2001
From: deajan <ozy@netpower.fr>
Date: Fri, 9 Sep 2016 08:14:29 +0200
Subject: [PATCH] Check for gpg recipient if encryption is used

---
 dev/n_obackup.sh | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/dev/n_obackup.sh b/dev/n_obackup.sh
index 985eeba..2c7c8fe 100755
--- a/dev/n_obackup.sh
+++ b/dev/n_obackup.sh
@@ -10,7 +10,7 @@ PROGRAM="obackup"
 AUTHOR="(C) 2013-2016 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
 PROGRAM_VERSION=2.1-dev
-PROGRAM_BUILD=2016090405
+PROGRAM_BUILD=2016090901
 IS_STABLE=no
 
 source "./ofunctions.sh"
@@ -112,10 +112,10 @@ function CheckEnvironment {
 function CheckCryptEnvironnment {
 	if ! type gpg2 > /dev/null 2>&1 ; then
 		if ! type gpg > /dev/null 2>&1; then
-			Logger "gpg2 nor gpg not present. Cannot encrypt backup files." "CRITICAL"
+			Logger "Programs gpg2 nor gpg not present. Cannot encrypt backup files." "CRITICAL"
 			CAN_BACKUP_FILES=false
 		else
-			Logger "gpg2 not present, falling back to gpg." "NOTICE"
+			Logger "Program gpg2 not present, falling back to gpg." "NOTICE"
 			CRYPT_TOOL=gpg
 		fi
 	else
@@ -179,9 +179,14 @@ function CheckCurrentConfig {
 		exit 1
 	fi
 
-	if [ "$ENCRYPTION" == "yes" ] && [ "$CRYPT_STORAGE" == "" ]; then
-		Logger "CRYPT_STORAGE not defined." "CRITICAL"
-		exit 1
+	if [ "$ENCRYPTION" == "yes" ]; then
+		if [ "$CRYPT_STORAGE" == "" ]; then
+			Logger "CRYPT_STORAGE not defined." "CRITICAL"
+			exit 1
+		if [ "$GPG_RECIPIENT" == "" ], then
+			Logger "No GPG recipient defined." "CRITICAL"
+			exit 1
+		fi
 	fi
 
 
@@ -962,7 +967,7 @@ function BackupDatabases {
 }
 
 #TODO: exclusions don't work for encrypted files
-#TODO: add ParallelExec here ? Also rework ParallelExec to use files or variables, vars are max 4M, if cannot be combined, create ParallelExecFromFile
+#TODO: add ParallelExec here ?
 function EncryptFiles {
 	local filePath="${1}"	# Path of files to encrypt
 	local destPath="${2}"    # Path to store encrypted files
@@ -1234,8 +1239,8 @@ function _RotateBackupsLocal {
 	local cmd
 	local path
 
-	#TODO: Replace this iname with regex .*$PROGRAM\.[1-9][0-9]+
-	find "$backup_path" -mindepth 1 -maxdepth 1 ! -iname "*.$PROGRAM.[0-9]*" -print0 | while IFS= read -r -d $'\0' backup; do
+	#TODO: Replace this -name with regex .*$PROGRAM\.[1-9][0-9]+
+	find "$backup_path" -mindepth 1 -maxdepth 1 ! -name "*.$PROGRAM.[0-9]*" -print0 | while IFS= read -r -d $'\0' backup; do
 		copy=$rotate_copies
 		while [ $copy -gt 1 ]; do
 			if [ $copy -eq $rotate_copies ]; then