Merge tag '2.1.2'

This commit is contained in:
2023-06-07 20:05:48 -05:00
2610 changed files with 280502 additions and 109410 deletions

View File

@ -1,11 +1,11 @@
#!/usr/bin/env bash
#
# mfpr [1|2|3]
# mfpr [1|2]
#
# Make a PR against bugfix-1.1.x or bugfix-2.0.x
# Make a PR targeted to MarlinFirmware/[repo]
#
[[ $# < 2 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` [1|2|3] [branch]" 1>&2 ; exit 1; }
[[ $# < 2 && $1 != "-h" && $1 != "--help" ]] || { echo "usage: `basename $0` [1|2] [branch]" 1>&2 ; exit 1; }
MFINFO=$(mfinfo "$@") || exit 1
IFS=' ' read -a INFO <<< "$MFINFO"
@ -23,7 +23,7 @@ OLDBRANCH=${INFO[5]}
# See if it's been pushed yet
if [ -z "$(git branch -vv | grep ^\* | grep \\[origin)" ]; then firstpush; fi
OPEN=$(echo $(which gnome-open xdg-open open) | awk '{ print $1 }')
OPEN=$( which gnome-open xdg-open open | head -n1 )
URL="https://github.com/$ORG/$REPO/compare/$TARG...$FORK:$BRANCH?expand=1"
if [ -z "$OPEN" ]; then