diff --git a/apply-all-patch.sh b/apply-all-patch.sh index a8bd159..c9cbd9a 100644 --- a/apply-all-patch.sh +++ b/apply-all-patch.sh @@ -16,7 +16,7 @@ IFS=$'\n' PATCH_LIST=~/bromite/build/bromite_patches_list_new.txt if [ ! -f $PATCH_LIST ]; then - cp ~/bromite/build/bromite_patches_list.txt $PATCH_LIST + cp ~/bromite/build/bromite_patches_list.txt $PATCH_LIST fi echo "Phase 1: check clean" @@ -56,19 +56,29 @@ for current_file in $(cat $PATCH_LIST); do 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 - echo $PATCH_FILE + bash ~/bromite-buildtools/apply-single-patch.sh $PATCH_OLD_PATH/$current_file $PATCH_NEW_PATH || exit 1 - echo "" - LAST_COMMIT=$(git rev-parse HEAD) - echo "Last Commit " $LAST_COMMIT - bash ~/bromite-buildtools/export-single-patch.sh $LAST_COMMIT + if [ -z "$SILENT" ]; then + echo $current_file >>$DESTINATION + echo $PATCH_FILE - #cp -r ~/bromite/build/patches-new/* ~/br2/bromite/build/patches/ - #git -C ~/br2/bromite/ add . - #git -C ~/br2/bromite/ commit -m "$current_file" + echo "" + LAST_COMMIT=$(git rev-parse HEAD) + 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