back out OsString additions and added string literal disignation to

targets

Author: pderouen

rust/origen/cli/src/commands/mod.rs

@@ -20,7 +20,8 @@ pub fn launch(
     );
 
     if let Some(t) = targets {
-        let _t: Vec<String> = t.iter().map(|__t| format!("'{}'", __t)).collect();
+        // added r prefix to the string to force python to interpret as a string literal
+        let _t: Vec<String> = t.iter().map(|__t| format!("r'{}'", __t)).collect();
         cmd += &format!(", targets=[{}]", &_t.join(",")).to_string();
     }
 

rust/origen/cli/src/commands/setup.rs

@@ -6,7 +6,6 @@ use origen::core::term::*;
 use std::fs;
 use std::io;
 use std::path::PathBuf;
-use std::ffi::OsString;
 use std::process::Command;
 
 const POETRY_INSTALLER: &str =
@@ -65,7 +64,7 @@ pub fn run() {
                 fs::read_to_string(&get_poetry_file).expect("Unable to read Poetry install file");
             let new_data = data.replace(
                 "/bin/env python",
-                &format!("/bin/env {}", PYTHON_CONFIG.command.clone().into_string().unwrap()),
+                &format!("/bin/env {}", PYTHON_CONFIG.command),
             );
             fs::write(&get_poetry_file, new_data).expect("Unable to write Poetry install file");
 
@@ -80,8 +79,8 @@ pub fn run() {
                 // Have to use --preview here to get a 1.0.0 pre version, can only use versions for
                 // official releases
                 Command::new(&PYTHON_CONFIG.poetry_command)
-                    .arg(OsString::from("self:update"))
-                    .arg(OsString::from("--preview"))
+                    .arg("self:update")
+                    .arg("--preview")
                     .status()
                     .expect("Something wend wrong updating Poetry");
             }
@@ -92,8 +91,8 @@ pub fn run() {
     print!("Are the app's deps. installed?  ... ");
 
     let status = Command::new(&PYTHON_CONFIG.poetry_command)
-        .arg(OsString::from("install"))
-        .arg(OsString::from("--no-root"))
+        .arg("install")
+        .arg("--no-root")
         .status();
 
     if status.is_ok() {

rust/origen/cli/src/python.rs

@@ -1,7 +1,6 @@
 // Responsible for managing Python execution
 
 use std::process::Command;
-use std::ffi::OsString;
 use origen::STATUS;
 use semver::Version;
 use std::path::PathBuf;
@@ -22,7 +21,7 @@ lazy_static! {
 
 pub struct Config {
     pub available: bool,
-    pub command: OsString,
+    pub command: String,
     pub version: Version,
     pub error: String,
     pub poetry_command: PathBuf,
@@ -41,7 +40,7 @@ impl Default for Config {
                     if version >= Version::parse(MIN_PYTHON_VERSION).unwrap() {
                         return Config {
                             available: true,
-                            command: OsString::from(cmd.to_string()),
+                            command: cmd.to_string(),
                             version: version,
                             error: "".to_string(),
                             poetry_command: poetry_cmd,
@@ -57,7 +56,7 @@ impl Default for Config {
         }
         Config {
             available: false,
-            command: OsString::new(),
+            command: String::new(),
             version: Version::parse("0.0.0").unwrap(),
             error: msg,
             poetry_command: PathBuf::new(),
@@ -67,7 +66,7 @@ impl Default for Config {
 
 /// Get the Python version from the given command
 fn get_version(command: &str) -> Option<Version> {
-    match Command::new(OsString::from(command)).arg("--version").output() {
+    match Command::new(command).arg("--version").output() {
         Ok(output) => return extract_version(std::str::from_utf8(&output.stdout).unwrap()),
         Err(_e) => return None,
     }
@@ -105,7 +104,7 @@ pub fn run(code: &str) {
         .arg("run")
         .arg(&PYTHON_CONFIG.command)
         .arg("-c")
-        .arg(OsString::from(&code))
+        .arg(&code)
         .status();
 }