Makes a few improvements for CI usability of testez-cli (#104)

* Allow testing with roblox-cli to fail the check for roblox install and omit the content folder arguments accordingly * Exit with an error code whenever roblox-cli does so * Remove incorrect process exiting behavior * Remove unneeded 'use' * Inline roblox studio install check Co-authored-by: Lucien Greathouse <[email protected]> Co-authored-by: Lucien Greathouse <[email protected]>
Roblox · May 20, 2020 · a9d1918 · a9d1918
1 parent cb76db6
commit a9d1918
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/testez-cli/src/tools/roblox_cli.rs b/testez-cli/src/tools/roblox_cli.rs
@@ -7,9 +7,6 @@ use roblox_install::RobloxStudio;
 pub fn roblox_cli_run(place_path: &Path, entrypoint_path: &str, as_core_script: bool) {
     let place_arg = place_path.to_str().unwrap();
 
-    let install = RobloxStudio::locate().expect("couldn't find Roblox Studio; is it installed?");
-    let content_path_arg = install.content_path().to_str().unwrap();
-
     log::trace!("Executing 'roblox-cli run'");
 
     let mut command = Command::new("roblox-cli");
@@ -19,10 +16,14 @@ pub fn roblox_cli_run(place_path: &Path, entrypoint_path: &str, as_core_script:
         &place_arg,
         "--entrypoint",
         entrypoint_path,
-        "--assetFolder",
-        &content_path_arg,
     ]);
 
+    if let Ok(install_location) = RobloxStudio::locate() {
+        let content_path_arg = install_location.content_path().to_str().unwrap();
+        command.arg("--assetFolder");
+        command.arg(&content_path_arg);
+    }
+
     if as_core_script {
         command.arg("--load.asRobloxScript");
     }