midou/bromite-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update apply-single-patch.sh

Browse Source
This commit is contained in:
uazo 2022-01-14 14:37:31 +01:00 committed by GitHub
parent 9d611cc535
commit 53605d6156
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 59 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
apply-single-patch.sh
View File

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