From 0940ffb9b2bc7ff5a889d83706afc3d436fad464 Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Tue, 4 Jan 2022 04:30:15 +0100
Subject: [PATCH 1/2] [pm_unapply] Let log output be more expressive and
 consistent

---
 src/tools/pm_unapply | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/tools/pm_unapply b/src/tools/pm_unapply
index d508dc0a..1279b804 100644
--- a/src/tools/pm_unapply
+++ b/src/tools/pm_unapply
@@ -97,8 +97,8 @@ clean_backup_patch() {
   log
 
   rm -rf "$PM_PATCH_BACKUP_DIR" > /dev/null 2>&1
-  log "Removed backup"
-  log "  backup: $PM_PATCH_BACKUP_DIR"
+  log "Removed backup: $PM_PATCH_BACKUP_DIR"
+  log
 }
 
 #
@@ -106,18 +106,18 @@ clean_backup_patch() {
 #
 
 if [ ! -f "$PM_LOG_FILE" ]; then
-  log "*** Patch Log Created by Unapply $(date) ***"
+  log "*** Patch-log created by pm_unapply script $(date) ***"
 fi
 
 log
 log "----------------------------------"
-log "PM UNAPPLY $(date)"
+log "pm_unapply $(date)"
 log "----------------------------------"
 log
 
 log "$(basename "$PATCH_DIR")"
 
-log "Using PATCH_FILE=$PATCH_FILE"
+log "Using PATCH_FILE: $PATCH_FILE"
 
 if [ -f "$PATCH_FILE" ]; then
   log "  contains text patch"
@@ -126,12 +126,12 @@ fi
 log
 
 if [ ! -x "$PATCH_EXEC" ]; then
-  log "ERROR: Cannot find $PATCH_EXEC"
+  log "ERROR: Cannot find patch executable $PATCH_EXEC"
   failure
 fi
 
 if [ ! -f "$PATCH_FILE" ]; then
-  log "ERROR: Cannot find patch file !"
+  log "ERROR: Cannot find patch file $PATCH_FILE"
   failure
 fi
 

From a4641c92319ba0bcc15d7b4f7c9e41bfd946b468 Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Tue, 4 Jan 2022 18:05:04 +0100
Subject: [PATCH 2/2] Do not output $PATCH_FILE twice

---
 src/tools/pm_unapply | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/tools/pm_unapply b/src/tools/pm_unapply
index 1279b804..06d47e6e 100644
--- a/src/tools/pm_unapply
+++ b/src/tools/pm_unapply
@@ -117,7 +117,7 @@ log
 
 log "$(basename "$PATCH_DIR")"
 
-log "Using PATCH_FILE: $PATCH_FILE"
+log "Using patch file: $PATCH_FILE"
 
 if [ -f "$PATCH_FILE" ]; then
   log "  contains text patch"
@@ -131,7 +131,7 @@ if [ ! -x "$PATCH_EXEC" ]; then
 fi
 
 if [ ! -f "$PATCH_FILE" ]; then
-  log "ERROR: Cannot find patch file $PATCH_FILE"
+  log "ERROR: Cannot find patch file!"
   failure
 fi