MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Patch mfqp for use directly with MarlinDocumentation

Browse Source
This commit is contained in:
Scott Lahteine 2017-05-07 01:22:45 -05:00
parent 1c4ed8b106
commit 6c2e6ea38e
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
buildroot/share/git/mfdoc
View File

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

13
buildroot/share/git/mfqp
View File

@ -8,6 +8,10 @@
MFINFO=$(mfinfo) || exit MFINFO=$(mfinfo) || exit
IFS=' ' read -a INFO <<< "$MFINFO" IFS=' ' read -a INFO <<< "$MFINFO"
if [[ ${INFO[4]} == "(no" ]]; then
echo "Branch is unavailable!" ; exit 1
fi
case "$#" in case "$#" in
0 ) ;; 0 ) ;;
* ) echo "Usage: `basename $0`" 1>&2 ; exit 1 ;; * ) echo "Usage: `basename $0`" 1>&2 ; exit 1 ;;
@ -15,5 +19,14 @@ esac
git add * .travis.yml git add * .travis.yml
git commit -m "patch" git commit -m "patch"
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 mfrb
git push -f git push -f
fi