git: bf81c5046f - main - FDP: Upgrade MacOS build instructions
Sergio Carlavilla Delgado <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.doc |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by carlavilla: URL: https://cgit.FreeBSD.org/doc/commit/?id=bf81c5046f6d55d7985f28a5994b0a5488ad9587 commit bf81c5046f6d55d7985f28a5994b0a5488ad9587 Author: Minsoo Choo <[email protected]> AuthorDate: 2023-07-14 14:36:01 +0000 Commit: Sergio Carlavilla Delgado <[email protected]> CommitDate: 2023-07-14 14:36:01 +0000 FDP: Upgrade MacOS build instructions - Upgrade MacOS build instructions - Remove tip about use Hugo 0.90 or higher Differential Revision: https://reviews.freebsd.org/D41036 --- documentation/Makefile | 2 +- .../content/en/books/fdp-primer/overview/_index.adoc | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/documentation/Makefile b/documentation/Makefile index 825c235269..1ed2666850 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -41,7 +41,7 @@ GEMBASE?= ${GEM_PATH} GEMBASE?= ${LOCALBASE} .endif -RUBY_CMD = ${GEMBASE}/bin/ruby +RUBY_CMD ?= ${LOCALBASE}/bin/ruby HUGO_CMD = ${LOCALBASE}/bin/hugo HUGO_ARGS?= --minify HUGO_OFFLINE_ARGS?= --environment offline --verbose --minify diff --git a/documentation/content/en/books/fdp-primer/overview/_index.adoc b/documentation/content/en/books/fdp-primer/overview/_index.adoc index d0f8f19972..b17d7ba66a 100644 --- a/documentation/content/en/books/fdp-primer/overview/_index.adoc +++ b/documentation/content/en/books/fdp-primer/overview/_index.adoc @@ -253,10 +253,6 @@ Finally, use the btn:[Submit Bug] button to submit your diff to the problem repo [.procedure] ==== -[TIP] -====== -Hugo version 0.90 or higher must be used -====== . Install these packages using link:https://brew.sh/[Homebrew] and link:https://rubygems.org/[RubyGem]. + @@ -274,6 +270,13 @@ $ echo 'export PATH="$(brew --prefix ruby)/bin:$PATH"' >> ~/.zshrc $ source ~/.zshrc .... + +. Add git alias to Homebrew git since `git format-patch` from Apple-provided git won't work with Phabricator. ++ +[source,shell] +.... +$ echo 'alias git=/usr/local/bin/git' >> ~/.zshrc +$ source ~/.zshrc +.... . Install the rouge package using RubyGem. + [source,shell] @@ -297,7 +300,7 @@ Repeat until all of the errors are resolved. + [source,shell] .... -$ bmake run LOCALBASE=/opt/homebrew USE_RUBYGEMS=YES +$ bmake run USE_RUBYGEMS=YES RUBY_CMD=$(brew --prefix ruby)/bin/ruby .... . Add all the files with `git add .`, then review the diff with `git diff`. For example: +