Skip to content

rust-installer: Use env(1) in the shebang. #113940

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

Conversation

inferiorhumanorgans
Copy link

This fixes the case (e.g. *BSD) where bash is installed on the host system, but not at the typical location of /bin.

This fixes the case (e.g. *BSD) where bash is installed on the host
system, but not at the typical location of /bin.
@rustbot
Copy link
Collaborator

rustbot commented Jul 22, 2023

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

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 22, 2023
Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

Thank you!

@onur-ozkan
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 22, 2023

📌 Commit 302ad21 has been approved by ozkanonur

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 22, 2023
@onur-ozkan
Copy link
Member

believe that other scripts in rust-analyzer should also use env to find bash path

@bors r-
@rustbot author

@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 22, 2023
@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 22, 2023
@inferiorhumanorgans
Copy link
Author

inferiorhumanorgans commented Jul 23, 2023

believe that other scripts in rust-analyzer should also use env to find bash path

For the rest of the installer scripts I think there's a good case to be made for switching them over, however I'm not in a great position to test them.

I've run ./x dist successfully without modification on a machine that doesn't have /bin/bash (or at least I think I did…), but am pretty green at building rust and currently focused on cross compiling a native toolchain from a machine that has /bin/bash.

@onur-ozkan
Copy link
Member

however I'm not in a great position to test them.

Sure 👍

I will take a look on those later then. Thanks for the PR!

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 24, 2023

📌 Commit 302ad21 has been approved by ozkanonur

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 24, 2023
@bors
Copy link
Collaborator

bors commented Jul 24, 2023

⌛ Testing commit 302ad21 with merge bccefd2...

@bors
Copy link
Collaborator

bors commented Jul 24, 2023

☀️ Test successful - checks-actions
Approved by: ozkanonur
Pushing bccefd2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 24, 2023
@bors bors merged commit bccefd2 into rust-lang:master Jul 24, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 24, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (bccefd2): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-3.0% [-3.0%, -3.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -3.0% [-3.0%, -3.0%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 651.225s -> 652.153s (0.14%)

@inferiorhumanorgans inferiorhumanorgans deleted the installer-no-hardcode-bash-path branch August 1, 2023 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants