Skip to content

use native delimiter on Windows #18

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

Merged
merged 1 commit into from
Mar 2, 2023
Merged

use native delimiter on Windows #18

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
10 changes: 8 additions & 2 deletions crates/spin-python-cli/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ use {
zstd::Decoder,
};

#[cfg(unix)]
const NATIVE_PATH_DELIMITER: char = ':';

#[cfg(windows)]
const NATIVE_PATH_DELIMITER: char = ';';

/// A Spin plugin to convert Python apps to Spin-compatible WebAssembly modules
#[derive(Parser, Debug)]
#[command(author, version, about, name = "py2wasm")]
Expand Down Expand Up @@ -62,7 +68,7 @@ fn main() -> Result<()> {

let python_path = options
.python_path
.split(':')
.split(NATIVE_PATH_DELIMITER)
.enumerate()
.map(|(index, path)| {
let index = index.to_string();
Expand Down Expand Up @@ -98,7 +104,7 @@ fn main() -> Result<()> {
let mut python_path = options.python_path;
if let Some(site_packages) = find_site_packages()? {
python_path = format!(
"{python_path}:{}",
"{python_path}{NATIVE_PATH_DELIMITER}{}",
site_packages
.to_str()
.context("non-UTF-8 site-packages name")?
Expand Down