1
0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-26 13:25:54 +00:00

Patch mfqp for use directly with MarlinDocumentation

This commit is contained in:
Scott Lahteine 2017-05-07 01:22:45 -05:00
parent 41cf1c9e6a
commit 232f5d235d
2 changed files with 16 additions and 3 deletions

View File

@ -37,7 +37,7 @@ opensite() {
echo "Previewing MarlinDocumentation..."
# wait to open the url for about 8s
( sleep 8; opensite ) &
( sleep 45; opensite ) &
bundle exec jekyll serve --watch --incremental

View File

@ -8,6 +8,10 @@
MFINFO=$(mfinfo) || exit
IFS=' ' read -a INFO <<< "$MFINFO"
if [[ ${INFO[4]} == "(no" ]]; then
echo "Branch is unavailable!" ; exit 1
fi
case "$#" in
0 ) ;;
* ) echo "Usage: `basename $0`" 1>&2 ; exit 1 ;;
@ -15,5 +19,14 @@ esac
git add * .travis.yml
git commit -m "patch"
mfrb
git push -f
if [[ ${INFO[3]} == ${INFO[4]} ]]; then
if [[ ${INFO[2]} == "MarlinDocumentation" ]]; then
git rebase -i HEAD~2
else
echo "Don't alter the PR target branch."; exit 1
fi
else
mfrb
git push -f
fi