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

Update apply-all-patch.sh

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

32
apply-all-patch.sh
View File

@ -16,7 +16,7 @@ IFS=$'\n'
PATCH_LIST=~/bromite/build/bromite_patches_list_new.txt PATCH_LIST=~/bromite/build/bromite_patches_list_new.txt
if [ ! -f $PATCH_LIST ]; then if [ ! -f $PATCH_LIST ]; then
cp ~/bromite/build/bromite_patches_list.txt $PATCH_LIST cp ~/bromite/build/bromite_patches_list.txt $PATCH_LIST
fi fi
echo "Phase 1: check clean" echo "Phase 1: check clean"
@ -56,19 +56,29 @@ for current_file in $(cat $PATCH_LIST); do
else else
bash ~/bromite-buildtools/apply-single-patch.sh $PATCH_OLD_PATH/$current_file $PATCH_NEW_PATH if [ -n "$SKIPAUTOGENERATED" ]; then
if [[ "$current_file" == *"Automated-domain-substitution"* ]]; then
echo ""
echo -e ${RED} " -> Excluding $current_file" ${NC}
continue
fi
fi
echo $current_file >>$DESTINATION bash ~/bromite-buildtools/apply-single-patch.sh $PATCH_OLD_PATH/$current_file $PATCH_NEW_PATH || exit 1
echo $PATCH_FILE
echo "" if [ -z "$SILENT" ]; then
LAST_COMMIT=$(git rev-parse HEAD) echo $current_file >>$DESTINATION
echo "Last Commit " $LAST_COMMIT echo $PATCH_FILE
bash ~/bromite-buildtools/export-single-patch.sh $LAST_COMMIT
#cp -r ~/bromite/build/patches-new/* ~/br2/bromite/build/patches/ echo ""
#git -C ~/br2/bromite/ add . LAST_COMMIT=$(git rev-parse HEAD)
#git -C ~/br2/bromite/ commit -m "$current_file" echo "Last Commit " $LAST_COMMIT
bash ~/bromite-buildtools/export-single-patch.sh $LAST_COMMIT || exit 1
#cp -r ~/bromite/build/patches-new/* ~/br2/bromite/build/patches/
#git -C ~/br2/bromite/ add .
#git -C ~/br2/bromite/ commit -m "$current_file"
fi
fi fi