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

Change directory rather than setting working dir #139

Merged
merged 1 commit into from
Nov 11, 2024
Merged

Change directory rather than setting working dir #139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 13 additions & 16 deletions buildpacks/dotnet/src/launch_process.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use crate::dotnet::project::ProjectType;
use crate::dotnet::solution::Solution;
use libcnb::data::launch::{
Process, ProcessBuilder, ProcessType, ProcessTypeError, WorkingDirectory,
};
use libcnb::data::launch::{Process, ProcessBuilder, ProcessType, ProcessTypeError};

#[derive(Debug)]
pub(crate) enum LaunchProcessDetectionError {
Expand Down Expand Up @@ -41,11 +39,17 @@ pub(crate) fn detect_solution_processes(
)
.expect("Project to be nested in solution parent directory");

let mut command = relative_executable_path
.file_name()
.expect("Executable path to never terminate in `..`")
.to_string_lossy()
.to_string();
let mut command = format!(
"cd {}; ./{}",
relative_executable_path
.parent()
.expect("Path to always have a parent directory")
.display(),
relative_executable_path
.file_name()
.expect("Path to never terminate in `..`")
.to_string_lossy()
);

if project.project_type == ProjectType::WebApplication {
command.push_str(" --urls http://0.0.0.0:$PORT");
Expand All @@ -56,14 +60,7 @@ pub(crate) fn detect_solution_processes(
.parse::<ProcessType>()
.map_err(LaunchProcessDetectionError::ProcessType)
.map(|process_type| {
ProcessBuilder::new(process_type, ["bash", "-c", &format!("./{}", &command)])
.working_directory(WorkingDirectory::Directory(
relative_executable_path
.parent()
.expect("Executable path to always have a parent directory")
.to_path_buf(),
))
.build()
ProcessBuilder::new(process_type, ["bash", "-c", &command]).build()
})
})
.collect::<Result<_, _>>()
Expand Down