From 53605d615666c9d995cf94236002a6636120509c Mon Sep 17 00:00:00 2001
From: uazo <29201891+uazo@users.noreply.github.com>
Date: Fri, 14 Jan 2022 14:37:31 +0100
Subject: [PATCH] Update apply-single-patch.sh

---
 apply-single-patch.sh | 111 ++++++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 52 deletions(-)

diff --git a/apply-single-patch.sh b/apply-single-patch.sh
index 916f3a8..ae6b6c9 100644
--- a/apply-single-patch.sh
+++ b/apply-single-patch.sh
@@ -28,75 +28,82 @@ if [[ OK -eq 0 ]]; then
                 test -f $file || OK=0
         done
 
-	for file in $(find . -name *.rej); do
-		echo " -> Check $file" | tee -a ${LOG_FILE};
-		wiggle --no-ignore --replace ${file::-4} $file && rm $file && rm ${file::-4}.porig && echo "    OK" || OK=0
-	done
+        for file in $(find . -name *.rej); do
+                echo " -> Check $file" | tee -a ${LOG_FILE};
+                wiggle --no-ignore --replace ${file::-4} $file && rm $file && rm ${file::-4}.porig && echo "    OK" || OK=0
+        done
 
-	for file in $(find . -name *.rej); do
-		echo "---Found: $file" | tee -a ${LOG_FILE};
-		git add ${file::-4}
-		OK=0
-	done
+        for file in $(find . -name *.rej); do
+                echo "    Found: $file" | tee -a ${LOG_FILE};
+                git add ${file::-4}
+                OK=0
+        done
 
-	if [[ OK -eq 0 ]]; then
-		DOBUILD=1
-		echo "Current patch $PATCH" | tee -a ${LOG_FILE}
-		echo "Patch not apply cleanly. Please fix... (next phase: build)" | tee -a ${LOG_FILE}
-		echo "Press return"
-		read  -n 1
-	else
-		echo "Patch not apply cleanly. Wiggle done!" | tee -a ${LOG_FILE}
-	fi
+        if [[ OK -eq 0 ]]; then
+                DOBUILD=1
+                echo "Current patch $PATCH" | tee -a ${LOG_FILE}
+                echo "   Patch not apply cleanly. Please fix..." | tee -a ${LOG_FILE}
+                if [ -n "$SILENT" ]; then
+                   exit 1
+                fi
+                echo "   Press return"
+                read  -n 1
+        else
+                echo "   Patch not apply cleanly. Wiggle done!" | tee -a ${LOG_FILE}
+        fi
 
-	echo "  Deleting rej"
+        echo "   Deleting rej"
         find . -type f -name '*.rej' -delete
         find . -type f -name '*.porig' -delete
 
 else
-	echo "Patch apply cleanly." | tee -a ${LOG_FILE}
-	DOBUILD=0
+        echo "Patch apply cleanly." | tee -a ${LOG_FILE}
+        DOBUILD=0
 fi
 
 if [[ DOBUILD -eq 1 ]]; then
-	OK=0
-	#echo "Building ${PATCH}: chrome_public_apk" | tee -a ${LOG_FILE}
-	#date "+%Y%m%d %H.%M.%S" | tee -a ${LOG_FILE}
-	#autoninja -C out/arm64 chrome_public_apk && OK=1
-	#date "+%Y%m%d %H.%M.%S" | tee -a ${LOG_FILE}
+        OK=0
+        #echo "Building ${PATCH}: chrome_public_apk" | tee -a ${LOG_FILE}
+        #date "+%Y%m%d %H.%M.%S" | tee -a ${LOG_FILE}
+        #autoninja -C out/arm64 chrome_public_apk && OK=1
+        #date "+%Y%m%d %H.%M.%S" | tee -a ${LOG_FILE}
 
-	#DOEXPORT=1
+        DOEXPORT=1
 
 fi
 
 if [[ OK -eq 0 ]]; then
-	echo "Read to add $PATCH. Press return"
-	read  -n 1
-
-	DOEXPORT=1
+        if [ -z "$SILENT" ]; then
+           echo "Read to add $PATCH. Press return"
+           read  -n 1
+        fi
 fi
 
 if [[ DOEXPORT -eq 1 ]]; then
-	until false
-	do
-       bash ~/bromite-buildtools/create-from-patch.sh $PATCH $2
+       until false
+       do
+           bash ~/bromite-buildtools/create-from-patch.sh $PATCH $2 || exit 1
 
-	   rm /tmp/1 /tmp/2 || true
-	   lsdiff $PATCH >/tmp/1
-	   lsdiff ../../bromite/build/patches-new/$(basename -- $PATCH) >/tmp/2
-	   STATUS="$(cmp --silent /tmp/1 /tmp/2; echo $?)"
-	   if [[ $STATUS -ne 0 ]]; then
-          git reset HEAD^
-		  diff /tmp/1 /tmp/2
-		  echo "Some files are missing. Check again." | tee -a ${LOG_FILE}
-		  read -r -p "y to continue [y/N] " response
-		  if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
-		       bash ~/bromite-buildtools/create-from-patch.sh $PATCH $2
-			   break
-		  fi
-	      bash
-	   else
-	      break
-	   fi
-	done
+           rm /tmp/1 /tmp/2 || true
+           lsdiff $PATCH >/tmp/1
+           lsdiff ../../bromite/build/patches-new/$(basename -- $PATCH) >/tmp/2
+           STATUS="$(cmp --silent /tmp/1 /tmp/2; echo $?)"
+           if [[ $STATUS -ne 0 ]]; then
+                  git reset HEAD^
+                  diff /tmp/1 /tmp/2
+                  echo "Some files are missing. Check again." | tee -a ${LOG_FILE}
+                  if [ -n "$SILENT" ]; then
+                     exit 1
+                  fi
+
+                  read -r -p "y to continue [y/N] " response
+                  if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]; then
+                       bash ~/bromite-buildtools/create-from-patch.sh $PATCH $2 || exit 1
+                       break
+                  fi
+              bash
+           else
+              break
+           fi
+        done
 fi