From 7f8a0e4bc1e94db325cd0348c92c6005b6fd84cf Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Tue, 16 Jul 2019 22:43:31 -0500
Subject: Add functions to safely apply patches to non-git sources

project_sources_patch() is the equivalent to git_patch() when working
with non-git sources. It should not be used with sources under a
version control system.
---
 libs/common  |  7 +++++++
 libs/project | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'libs')

diff --git a/libs/common b/libs/common
index 06b411e1..b1091e4f 100755
--- a/libs/common
+++ b/libs/common
@@ -117,6 +117,13 @@ diff_patch() {
 	patch -fd "$sources_path" -r - < "$patch_path"
 }
 
+diff_patch_check() {
+	local sources_path=$1
+	local patch_path=$2
+
+	patch -sfd "$sources_path" --dry-run < "$patch_path" > /dev/null 2>&1
+}
+
 path_wildcard_expand() {
 	local path=$@
 
diff --git a/libs/project b/libs/project
index 34b139a5..b130af17 100755
--- a/libs/project
+++ b/libs/project
@@ -584,7 +584,7 @@ project_sources_patch_recursive() {
 	fi
 
 	for patch in "$patches_path"/[!.]*.@(patch|diff); do
-		diff_patch "$sources_path" "$patch" || return 1
+		project_sources_patch "$sources_path" "$patch" || return 1
 	done
 
 	if [[ -n $path && $path != . ]]; then
@@ -608,6 +608,17 @@ project_blobs() {
 	fi
 }
 
+project_sources_patch() {
+	local sources_path=$1
+	local patch_path=$2
+
+	if diff_patch_check "$sources_path" "$patch_path"; then
+		diff_patch "$sources_path" "$patch_path"
+	else
+		return 1
+	fi
+}
+
 project_blobs_path() {
 	local project=$1
 	shift
-- 
cgit v1.2.3-70-g09d2