Skip to content

Fix terminfo database search path #37469

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

Merged
merged 1 commit into from
Nov 12, 2016
Merged

Fix terminfo database search path #37469

merged 1 commit into from
Nov 12, 2016

Conversation

meh
Copy link
Contributor

@meh meh commented Oct 29, 2016

This is more consistent with what every other program does, I happened to have TERMINFO set as /usr/share/terminfo but had the actual database in ~/.terminfo, regardless of that every other terminfo/ncurses based software picked up the one in the home correctly.

This just puts the path in TERMINFO at the top of the search paths, and moves the home checking to the default search paths section.

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

dirs_to_search.push(PathBuf::from(dir));
}

if let Ok(dirs) = match env::var("TERMINFO_DIRS") {
Copy link
Contributor

@LunaBorowska LunaBorowska Nov 6, 2016

Choose a reason for hiding this comment

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

match here is an error. You want to if let or match, not both here.

@alexcrichton
Copy link
Member

@bors: r+

Thanks @meh, sorry for the delay! Feel free to ping PRs if you feel like they're getting stale, they fall through the cracks occasionally by accident!

@bors
Copy link
Collaborator

bors commented Nov 10, 2016

📌 Commit f9cc166 has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Nov 11, 2016

⌛ Testing commit f9cc166 with merge 7b96738...

@alexcrichton
Copy link
Member

@bors: retry force clean

@bors
Copy link
Collaborator

bors commented Nov 12, 2016

⌛ Testing commit f9cc166 with merge b33873f...

bors added a commit that referenced this pull request Nov 12, 2016
Fix terminfo database search path

This is more consistent with what every other program does, I happened to have `TERMINFO` set as `/usr/share/terminfo` but had the actual database in `~/.terminfo`, regardless of that every other terminfo/ncurses based software picked up the one in the home correctly.

This just puts the path in `TERMINFO` at the top of the search paths, and moves the home checking to the default search paths section.
@bors bors merged commit f9cc166 into rust-lang:master Nov 12, 2016
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.

5 participants