From 0d1be3c83f6fda17b42df31757006c11a2300385 Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Wed, 12 Jan 2022 02:52:52 +0100
Subject: [PATCH 1/2] [pm_unapply] Enhance checks&balances and debug output

`if [ -f "$PATCH_FILE" ]` and later `if [ ! -f "$PATCH_FILE" ]` was a bit mindless.
---
 src/tools/pm_unapply | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/tools/pm_unapply b/src/tools/pm_unapply
index 06d47e6e..2c22e95f 100644
--- a/src/tools/pm_unapply
+++ b/src/tools/pm_unapply
@@ -9,6 +9,7 @@ PM_VAR_DIR="/tmp/patchmanager3"
 PATCH_ROOT_DIR="/usr/share/patchmanager/patches"
 
 # Paths / Files
+PARAMETER="$1"
 PATCH_DIR="$PATCH_ROOT_DIR/$1"
 
 PM_LOG_FILE="$PM_VAR_DIR/patchmanager.log"
@@ -106,30 +107,30 @@ clean_backup_patch() {
 #
 
 if [ ! -f "$PM_LOG_FILE" ]; then
-  log "*** Patch-log created by pm_unapply script $(date) ***"
+  log "*** Patch-log created by pm_unapply script $(date -Iseconds) ***"
 fi
 
 log
 log "----------------------------------"
-log "pm_unapply $(date)"
+log "pm_unapply $(date -Iseconds)"
 log "----------------------------------"
 log
 
-log "$(basename "$PATCH_DIR")"
-
-log "Using patch file: $PATCH_FILE"
-
-if [ -f "$PATCH_FILE" ]; then
-  log "  contains text patch"
+if [ -z "$PARAMETER" ]; then
+  log "ERROR: A parameter must be provided for unapplying!"
+  failure
 fi
 
+log "$(basename "$PATCH_DIR")"
 log
 
 if [ ! -x "$PATCH_EXEC" ]; then
-  log "ERROR: Cannot find patch executable $PATCH_EXEC"
+  log "ERROR: Cannot use patch executable ${PATCH_EXEC}!"
   failure
 fi
 
+log "Using patch file: $PATCH_FILE"
+
 if [ ! -f "$PATCH_FILE" ]; then
   log "ERROR: Cannot find patch file!"
   failure

From c6d8602aab40f726b8c52453ea4e035a034094bc Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Wed, 12 Jan 2022 03:07:03 +0100
Subject: [PATCH 2/2] Add PATCH_DIR check from pm_apply

---
 src/tools/pm_unapply | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/tools/pm_unapply b/src/tools/pm_unapply
index 2c22e95f..e3829ea9 100644
--- a/src/tools/pm_unapply
+++ b/src/tools/pm_unapply
@@ -121,6 +121,11 @@ if [ -z "$PARAMETER" ]; then
   failure
 fi
 
+if [ ! -d "$PATCH_DIR" ]; then
+  log "ERROR: $PATCH_DIR is not a directory or does not exist!"
+  failure
+fi
+
 log "$(basename "$PATCH_DIR")"
 log