Skip to content
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

Jump to bottom

Fix typo in man pages #3706

Closed
wants to merge 2 commits into from
Closed

Fix typo in man pages #3706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fd8531
Add (rudimentary) error handling to `make man`
dra27 Dec 14, 2018
626baf5
Fix typo in OPAMBESTEFFORT docs
dra27 Dec 14, 2018
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
1 change: 1 addition & 0 deletions .travis-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ export OCAMLRUNPARAM=b
make lib-ext
fi
make all
make man

rm -f ~/local/bin/opam
make install
Expand Down
12 changes: 7 additions & 5 deletions doc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,17 @@ all: man html pages
man:
rm -rf man
mkdir -p man
$(OPAM) $(HELPFMT) > man/opam.1
$(OPAM) $(HELPFMT) > man/opam.1 2> man/err
for i in $(TOPICS); do\
$(OPAM) $$i $(HELPFMT) > man/opam-$$i.1;\
$(OPAM) $$i $(HELPFMT) > man/opam-$$i.1 2>> man/err ; \
done
$(OPAM) admin $(HELPFMT) > man/opam-admin.1
$(OPAM) admin $(HELPFMT) > man/opam-admin.1 2>> man/err
for i in $(TOPICS_ADMIN); do\
$(OPAM) admin $$i $(HELPFMT) > man/opam-admin-$$i.1;\
$(OPAM) admin $$i $(HELPFMT) > man/opam-admin-$$i.1 2>> man/err ; \
done
$(OPAM_INSTALLER) $(HELPFMT) > man/opam-installer.1
$(OPAM_INSTALLER) $(HELPFMT) > man/opam-installer.1 2>> man/err
# Dune doesn't (yet) support --no-print-directory
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# Dune doesn't (yet) support --no-print-directory
# TODO Dune will support --no-print-directory in 1.7.0 and higher

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🙂 At the time I pushed this branch, I had only just opened the PR in Dune and didn't want to presume until it was merged. This comment could be changed on master, but I don't think we want to constrain Dune to >= 1.7.0 on the 2.0 branch

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense!

@if grep -v "^Entering directory '" man/err > man/err2 ; then cat man/err2 ; false ; fi

man-html: man
rm -rf man-html
Expand Down
2 changes: 1 addition & 1 deletion src/client/opamArg.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -979,7 +979,7 @@ let global_options =
"Don't fail if all requested packages can't be installed: try to install \
as many as possible. Note that not all external solvers may support \
this option (recent versions of $(i,aspcud) or $(i,mccs) should). This \
is equivalent to setting $($b,\\$OPAMBESTEFFORT) environment variable."
is equivalent to setting $(b,\\$OPAMBESTEFFORT) environment variable."
in
let safe_mode =
mk_flag ~section ["readonly"; "safe"]
Expand Down