Skip to content

[pull] bugfix-2.1.x from MarlinFirmware:bugfix-2.1.x #769

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jul 3, 2026
Merged

[pull] bugfix-2.1.x from MarlinFirmware:bugfix-2.1.x #769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions buildroot/share/git/mfdoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,29 @@
#
# Start Jekyll in watch mode to work on Marlin Documentation and preview locally
#
# Usage: mfdoc [--host HOST] [--port PORT]
#

TEST=0
case "$1" in
-t) TEST=1; shift ;;
"") ;;
*) echo "Usage: `basename $0` [-t]" 1>&2 ; exit 1 ;;
esac
[[ $# == 0 ]] || { echo "Usage: `basename $0` [-t]" 1>&2 ; exit 1; }
HOST="127.0.0.1"
PORT="4000"

while [[ $# -gt 0 ]]; do
case "$1" in
-t) TEST=1; shift ;;
--test) TEST=1; shift ;;
--host) shift; HOST="$1"; shift ;;
--port) shift; PORT="$1"; shift ;;
--help)
echo "Usage: `basename $0` [--test] [--host HOST] [--port PORT]"
exit 0
;;
*)
echo "Usage: `basename $0` [--test] [--host HOST] [--port PORT]" 1>&2
exit 1
;;
esac
done

MFINFO=$(mfinfo) || exit 1
IFS=' ' read -a INFO <<< "$MFINFO"
Expand All @@ -22,7 +37,7 @@ BRANCH=${INFO[5]}
[[ $ORG == "MarlinFirmware" && $REPO == "MarlinDocumentation" ]] || { echo "Wrong repository." 1>&2; exit 1; }

opensite() {
URL="http://127.0.0.1:4000/"
URL="http://$HOST:$PORT/"
OPEN=$( which gnome-open xdg-open open | head -n1 )
if [ -z "$OPEN" ]; then
echo "Can't find a tool to open the URL:"
Expand All @@ -40,7 +55,7 @@ fi

echo "Previewing MarlinDocumentation..."

bundle exec jekyll serve --watch --incremental | {
bundle exec jekyll serve --host "$HOST" --port "$PORT" --watch --incremental | {
while IFS= read -r line
do
[[ $line =~ "Server running" ]] && opensite
Expand Down
1 change: 1 addition & 0 deletions buildroot/share/git/mfinfo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ case "$REPO" in
Marlin ) TARG=bugfix-2.1.x ; ((INDEX == 1)) && TARG=bugfix-1.1.x ; [[ $BRANCH =~ ^[12]$ ]] && USAGE=1 ;;
Configurations ) TARG=import-2.1.x ;;
MarlinBuilds ) TARG=main ;;
Marlin3 ) TARG=dev ;;
* ) TARG=master ;;
esac

Expand Down
5 changes: 4 additions & 1 deletion buildroot/share/git/mfrb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/usr/bin/env bash
#
# mfrb
# MF Rebase manually to re-message, merge, drop, etc.
#
# Do "git rebase -i" against the repo's "target" branch
# Does "git rebase -i" against the repo's "target" branch
#
# Usually `git rebase -i upstream/bugfix-2.1.x`
#

MFINFO=$(mfinfo "$@") || exit 1
Expand Down
Loading