From 4ac7981c85e2f46a714c94af6eae3f38287355f6 Mon Sep 17 00:00:00 2001
From: Khwaja Yousuf <kyousufmo17@gmail.com>
Date: Wed, 10 Jan 2024 22:56:39 -0500
Subject: [PATCH] Update patching script: added an echo statement for better
 script execution visibility

---
 scripts/apatch.sh | 120 +++++++++++++++++++++++++---------------------
 1 file changed, 66 insertions(+), 54 deletions(-)

diff --git a/scripts/apatch.sh b/scripts/apatch.sh
index f56771d9efdb..2dcb411bb29c 100755
--- a/scripts/apatch.sh
+++ b/scripts/apatch.sh
@@ -1,75 +1,87 @@
 #!/usr/bin/env bash
+# Bash script for applying and wiggling patches using Git
+
+echo "Executing the patching script..."
 
 gitcmd="git -c commit.gpgsign=false"
 
 noapply=1
 isreject=0
+
+# Check if the "--noapplied" flag is provided
 if [[ $1 == "--noapplied" ]]; then
-	noapply=1
-	shift
+    noapply=1
+    shift
 fi
 
+# Check if a file is specified
 if [ ! -z "$1" ]; then
-	file="$1"
+    file="$1"
+# If no file is specified and there's a patch file in rebase-apply, use it
 elif [ -z "$1" ] && [ -f .git/rebase-apply/patch ]; then
-	file=".git/rebase-apply/patch"
-	noapply=1
-	isreject=1
+    file=".git/rebase-apply/patch"
+    noapply=1
+    isreject=1
 else
-	echo "Please specify a file"
-	exit 1
+    echo "Please specify a file"
+    exit 1
 fi
+
 applied=$(echo $file | sed 's/.patch$/-applied\.patch/g')
+
+# Check if the "--reset" flag is provided
 if [ "$1" == "--reset" ]; then
-	$gitcmd am --abort
-	$gitcmd reset --hard
-	$gitcmd clean -f
-	exit 0
+    $gitcmd am --abort
+    $gitcmd reset --hard
+    $gitcmd clean -f
+    exit 0
 fi
 
-
+# Attempt to apply the patch using "git am"
 (test "$isreject" != "1" && $gitcmd am -3 $file) || (
-	echo "Failures - Wiggling"
-	$gitcmd reset --hard
-	$gitcmd clean -f
-	errors=$($gitcmd apply --rej $file 2>&1)
-	echo "$errors" >> ~/patch.log
-	export missingfiles=""
-	export summaryfail=""
-	export summarygood=""
-	for i in $(find . -name \*.rej); do
-        	base=$(echo "$i" | sed 's/.rej//g')
-		if [ -f "$i" ]; then
-        		sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i $i && wiggle -v -l --replace "$base" "$i"
-        		rm "$base.porig" "$i"
-		else
-			echo "No such file: $base"
-			missingfiles="$missingfiles\n$base"
-		fi
-	done
-	for i in $($gitcmd status --porcelain | awk '{print $2}'); do
-		filedata=$(cat "$i")
-		if [ -f "$file" ] && [[ "$filedata" == *"<<<<<"* ]]; then
-			export summaryfail="$summaryfail\nFAILED TO APPLY: $i"
-		else
-			$gitcmd add --force "$i"
-			export summarygood="$summarygood\nAPPLIED CLEAN: $i"
-		fi
-	done
-	echo -e "$summarygood"
-	echo -e "$summaryfail"
-	if [[ "$errors" == *"No such file"* ]]; then
-		echo "===========================";
-		echo " "
-		echo " MISSING FILES"
-		echo $(echo "$errors" | grep "No such file")
-		echo -e "$missingfiles"
-		echo " "
-		echo "===========================";
-	fi
-	$gitcmd status
-	$gitcmd diff
+    echo "Failures - Wiggling"
+    $gitcmd reset --hard
+    $gitcmd clean -f
+    errors=$($gitcmd apply --rej $file 2>&1)
+    echo "$errors" >> ~/patch.log
+    export missingfiles=""
+    export summaryfail=""
+    export summarygood=""
+    for i in $(find . -name \*.rej); do
+        base=$(echo "$i" | sed 's/.rej//g')
+        if [ -f "$i" ]; then
+            sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i $i && wiggle -v -l --replace "$base" "$i"
+            rm "$base.porig" "$i"
+        else
+            echo "No such file: $base"
+            missingfiles="$missingfiles\n$base"
+        fi
+    done
+    for i in $($gitcmd status --porcelain | awk '{print $2}'); do
+        filedata=$(cat "$i")
+        if [ -f "$file" ] && [[ "$filedata" == *"<<<<<"* ]]; then
+            export summaryfail="$summaryfail\nFAILED TO APPLY: $i"
+        else
+            $gitcmd add --force "$i"
+            export summarygood="$summarygood\nAPPLIED CLEAN: $i"
+        fi
+    done
+    echo -e "$summarygood"
+    echo -e "$summaryfail"
+    if [[ "$errors" == *"No such file"* ]]; then
+        echo "===========================";
+        echo " "
+        echo " MISSING FILES"
+        echo $(echo "$errors" | grep "No such file")
+        echo -e "$missingfiles"
+        echo " "
+        echo "===========================";
+    fi
+    $gitcmd status
+    $gitcmd diff
 )
+
+# Move the patch file to a new name if "--noapplied" is not specified and it's not already an applied patch
 if [[ "$noapply" != "1" ]] && [[ "$file" != *-applied.patch ]]; then
-	mv "$file" "$applied"
+    mv "$file" "$applied"
 fi