andrew.rioux/sparse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: improved the logic for generating binaries

Browse Source 
cross platform logic wasn't handled well for generating linux binaries
on windows or vice versa
This commit is contained in:
Andrew Rioux 2023-09-02 23:59:28 -04:00
parent 81fb2ed548
commit 7876e00dc8
Signed by: andrew.rioux
GPG Key ID: 9B8BAC47C17ABB94
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sparse-05/sparse-05-client/src/commands/generate.rs
View File

@ -29,11 +29,9 @@ pub async fn generate(mut name: PathBuf, port: u16, target: TargetOs) -> anyhow:
#[cfg(unix)] #[cfg(unix)]
file.mode(0o755); file.mode(0o755);
#[cfg(windows)]
let old_file_part = name.file_name().unwrap().to_owned(); let old_file_part = name.file_name().unwrap().to_owned();
#[cfg(windows)] if matches!(target, TargetOs::Windows) {
{
let mut file_part = name.file_name().unwrap().to_owned(); let mut file_part = name.file_name().unwrap().to_owned();
file_part.push(OsString::from(".exe")); file_part.push(OsString::from(".exe"));
name.pop(); name.pop();
@ -42,13 +40,16 @@ pub async fn generate(mut name: PathBuf, port: u16, target: TargetOs) -> anyhow:
let mut file = file.open(&name).await?; let mut file = file.open(&name).await?;
#[cfg(windows)] if matches!(target, TargetOs::Windows) {
{
name.pop(); name.pop();
name.push(old_file_part); name.push(old_file_part);
} }
file.write_all(SPARSE_LINUX_SERVER_BINARY).await?; file.write_all(match target {
TargetOs::Windows => SPARSE_WINDOWS_SERVER_BINARY,
TargetOs::Linux => SPARSE_LINUX_SERVER_BINARY,
})
.await?;
file.write_all(CONFIG_SEPARATOR).await?; file.write_all(CONFIG_SEPARATOR).await?;
file.write_all(&port.to_be_bytes()[..]).await?; file.write_all(&port.to_be_bytes()[..]).await?;
file.write_all(keypair.public.as_bytes()).await?; file.write_all(keypair.public.as_bytes()).await?;