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.

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

user-install: Make use of the R2PM_MANDIR variable. #659

Merged
merged 2 commits into from
Feb 18, 2025

Conversation

teasp00n
Copy link
Contributor

Makes use of the new R2PM_MANDIR variable exposed by r2pm.

Relies on code changes in radareorg/radare2#23963

See the NOTE in that MR for an explanation on how man pages in this location will actually be discovered.

@@ -91,6 +91,7 @@ LDFLAGS+=$(shell pkg-config --libs r_core r_io r_util)
endif
R2_BINDIR=$(shell r2 -H R2_PREFIX)/bin
R2PM_BINDIR=$(shell r2pm -H R2PM_BINDIR)
R2PM_MANDIR=$(shell r2pm -H R2PM_MANDIR)
Copy link
Member

Choose a reason for hiding this comment

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

Check if var is “” and set a default value because this should work with older versions of r2 too

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've added this in 845640b

Will ensure a legit value is used even when an old r2pm is being
used to install the plugin.
@teasp00n
Copy link
Contributor Author

I've canonicalized the paths using readlink -m. Let me know if there are environments where we want to install the plugin that might not have readlink and we can drop the commit.

@teasp00n teasp00n force-pushed the install-manpage-without-sudo branch from 543caf7 to 845640b Compare February 18, 2025 20:20
@teasp00n
Copy link
Contributor Author

I've canonicalized the paths using readlink -m. Let me know if there are environments where we want to install the plugin that might not have readlink and we can drop the commit.

readlink changes have been dropped.

@trufae trufae merged commit 77bac0c into nowsecure:master Feb 18, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants