From 1ea8d09af262ddeed87acf5916cec42d9a002da1 Mon Sep 17 00:00:00 2001
From: Andrew Robbins <contact@andrewrobbins.info>
Date: Wed, 31 May 2017 02:21:11 -0400
Subject: Patching now works. bucts can be patched & built.

Modified the function git_project_patch_recursive (in libs/git) to
enable patching with diff files, which uses the new function
diff_patch_file located in libs/common. A generic action script for
bucts is in projects/bucts/. Install/revision/target files are in
projects/bucts/configs/. bucts' merge into the new build system should
be nearly, if not already, complete.
---
 libs/common  | 17 +++++++++++++++++
 libs/git     | 36 ++++++++++++++++++------------------
 libs/project |  9 +++++----
 3 files changed, 40 insertions(+), 22 deletions(-)

(limited to 'libs')

diff --git a/libs/common b/libs/common
index a64a7b9b..8f1379ee 100755
--- a/libs/common
+++ b/libs/common
@@ -63,6 +63,23 @@ arguments_list() {
 	done
 }
 
+diff_patch_file() {
+	local repository_path="$1"
+	local patch_file_path="$2"
+
+	local filename_in_diff="$(sed -rne 's/^-{3} {1}(.*)$/\1/p' <"${patch_file_path}")"
+
+	local source_file_path
+
+	if ! ( grep -E '^-{3}.*/' <"${patch_file_path}" >/dev/null 2>&1 ); then
+		source_file_path="${repository_path}/${filename_in_diff##\ }"
+	else
+		source_file_path="${repository_path}/${filename_in_diff##*/}"
+	fi
+
+	patch "${source_file_path}" "${patch_file_path}"
+}
+
 path_wildcard_expand() {
 	local path=$@
 
diff --git a/libs/git b/libs/git
index e64173d9..a750be32 100755
--- a/libs/git
+++ b/libs/git
@@ -226,29 +226,29 @@ git_project_check() {
 }
 
 git_project_patch_recursive() {
-	local project=$1
-	local repository=$2
-	local branch=$3
-	local path=$4
+	local project="$1"
+	local repository="$2"
+	local branch="$3"
+	local path="${4:-.}"
 
-	local repository_path=$( git_project_repository_path "$repository" )
-	local project_path=$( project_path "$project" )
-	local patches_path="$project_path/$PATCHES/$path/$WILDDOTPATCH"
-	local patch_path
+	local repository_path="$(git_project_repository_path "${repository}")"
+	local project_path="$(project_path "${project}")"
+	local patches_path="${project_path}/${PATCHES}/${path}"
 
-	if ! [ -z "$path" ] && [ "$path" != "." ]
-	then
-		git_project_patch_recursive "$project" "$repository" "$branch" "$( dirname "$path" )"
+	if ! [[ -d "${patches_path}" ]]; then
+		return
 	fi
 
-	path_wildcard_expand "$patches_path" | while read patch_path
-	do
-		if ! [ -f "$patch_path" ]
-		then
-			continue
-		fi
+	if [[ "${path}" != "." ]]; then
+		git_project_patch_recursive "${project}" "${repository}" "${branch}" "$(dirname "${path}")"
+	fi
 
-		git_patch "$repository_path" "$branch" "$patch_path"
+	for patch in "${patches_path}"/[!.]*.{patch,diff}; do
+		if [[ "${patch##*.}" == "patch" ]]; then
+			git_patch "${repository_path}" "${branch}" "${patch}"
+		else
+			diff_patch_file "${repository_path}" "${patch}"
+		fi
 	done
 }
 
diff --git a/libs/project b/libs/project
index eb376ae0..20a6fe77 100755
--- a/libs/project
+++ b/libs/project
@@ -87,10 +87,11 @@ project_action() {
 
 		project_action_check "$action" "$project" "$@"
 
-		if [ $? -eq 0 ]
-		then
-			return 0
-		fi
+		# Why is this here? Commented out for now.
+		# if [ $? -eq 0 ]
+		# then
+		# 	return 0
+		# fi
 
 		project_include "$project"
 
-- 
cgit v1.2.3-70-g09d2