|
@@ -7,7 +7,7 @@
|
7
|
7
|
# - Remote (upstream) Org name (MarlinFirmware)
|
8
|
8
|
# - Remote (origin) Org name (your Github username)
|
9
|
9
|
# - Repo Name (Marlin, MarlinDocumentation)
|
10
|
|
-# - PR Target branch (bugfix-1.1.x, bugfix-2.0.x, etc.)
|
|
10
|
+# - PR Target branch (bugfix-1.1.x, bugfix-2.0.x, dev-2.1.x, etc.)
|
11
|
11
|
# - Branch Arg (the branch argument or current branch)
|
12
|
12
|
# - Current Branch
|
13
|
13
|
#
|
|
@@ -42,19 +42,19 @@ while [[ $# -gt 0 ]]; do
|
42
|
42
|
|
43
|
43
|
case "$opt" in
|
44
|
44
|
-*|--*) MORE="$MORE$opt " ; [[ $EQUALS == 1 ]] && MORE="$MORE=$val" ;;
|
45
|
|
- 1|2) INDEX=$opt ;;
|
|
45
|
+ 1|2|3) INDEX=$opt ;;
|
46
|
46
|
*) BRANCH="$opt" ;;
|
47
|
47
|
esac
|
48
|
48
|
|
49
|
49
|
done
|
50
|
50
|
|
51
|
51
|
case "$REPO" in
|
52
|
|
- Marlin ) TARG=bugfix-1.1.x ; [[ $INDEX == 2 ]] && TARG=bugfix-2.0.x ;;
|
|
52
|
+ Marlin ) TARG=bugfix-1.1.x ; [[ $INDEX == 2 ]] && TARG=bugfix-2.0.x ; [[ $INDEX == 3 ]] && TARG=dev-2.1.x ;;
|
53
|
53
|
MarlinDocumentation ) TARG=master ;;
|
54
|
54
|
esac
|
55
|
55
|
|
56
|
|
-[[ $BRANCH =~ ^[0-9]$ ]] && USAGE=1
|
|
56
|
+[[ $BRANCH =~ ^[123]$ ]] && USAGE=1
|
57
|
57
|
|
58
|
|
-[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2] [branch]" 1>&2 ; exit 1 ; }
|
|
58
|
+[[ $USAGE == 1 ]] && { echo "usage: `basename $0` [1|2|3] [branch]" 1>&2 ; exit 1 ; }
|
59
|
59
|
|
60
|
60
|
echo "$ORG $FORK $REPO $TARG $BRANCH $CURR $MORE"
|