Skip to content

Commit 4300712

Browse files
vaadin-botknoobiemcollovati
authored
fix: include /usr/bin as location for linux tools (#25026) (CP: 25.2) (#25031)
This PR cherry-picks changes from the original PR #25026 to branch 25.2. --- #### Original PR description > <!-- PLEASE READ AND FOLLOW THE TEMPLATE! THE PR CAN BE REJECTED OTHERWISE (This line should be removed when submitting) --> > > ## Description > > When installing nodejs through the package manager it lands in `/usr/bin` > > ## Type of change > > - [x] Bugfix > - [ ] Feature > > ## Checklist > > - [x] I have read the contribution guide: https://vaadin.com/docs/latest/guide/contributing/overview/ > - [x] I have added a description following the guideline. > - [ ] The issue is created in the corresponding repository and I have referenced it. > - [ ] I have added tests to ensure my change is effective and works as intended. > - [ ] New and existing tests are passing locally with my change. > - [x] I have performed self-review and corrected misspellings. > > #### Additional for `Feature` type of change > > - [ ] Enhancement / new feature was discussed in a corresponding GitHub issue and Acceptance Criteria were created. > Co-authored-by: Knoobie <Knoobie@gmx.de> Co-authored-by: Marco Collovati <marco@vaadin.com>
1 parent 503296a commit 4300712

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

flow-build-tools/src/main/java/com/vaadin/flow/server/frontend/FrontendToolsLocator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public Optional<File> tryLocateTool(String toolName) {
8383
.map(this::omitErrorResult).map(CommandResult::getStdout)
8484
.orElseGet(() -> Arrays.asList(
8585
// Add most common paths in unix #5611
86-
"/usr/local/bin/" + toolName,
86+
"/usr/bin/" + toolName, "/usr/local/bin/" + toolName,
8787
"/opt/local/bin/" + toolName, "/opt/bin/" + toolName));
8888

8989
for (String candidateLocation : candidateLocations) {

0 commit comments

Comments
 (0)