Merge pull request #313 from boozook/fix-simulator-utils

Fix `simulator-utils` bug: can't run pdx on macOs by relative path
boozook · Apr 17, 2024 · a2d3649 · a2d3649
2 parents b515c87 + a5d894f
commit a2d3649
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/support/sim-ctrl/Cargo.toml b/support/sim-ctrl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playdate-simulator-utils"
-version = "0.1.4"
+version = "0.1.5"
 readme = "README.md"
 description = "Cross-platform utils to deal with Playdate Simulator."
 keywords = ["playdate", "sdk", "utils"]

diff --git a/support/sim-ctrl/src/run.rs b/support/sim-ctrl/src/run.rs
@@ -13,6 +13,7 @@ pub async fn run(pdx: &Path, sdk: Option<&Path>) -> Result<(), Error> {
 
 	#[allow(unused_mut)]
 	let mut cmd = command(pdx, sdk)?;
+
 	#[cfg(any(feature = "tokio", feature = "async-std"))]
 	let mut cmd = Command::from(cmd);
 
@@ -29,6 +30,7 @@ pub async fn run(pdx: &Path, sdk: Option<&Path>) -> Result<(), Error> {
 
 #[cfg_attr(feature = "tracing", tracing::instrument)]
 pub fn command(pdx: &Path, sdk: Option<&Path>) -> Result<std::process::Command, Error> {
+	let pdx = pdx.canonicalize()?;
 	let sdk = sdk.map_or_else(Sdk::try_new, Sdk::try_new_exact)?;
 
 	let (pwd, sim) = if cfg!(target_os = "macos") {

diff --git a/support/tool/Cargo.toml b/support/tool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "playdate-tool"
-version = "0.3.1"
+version = "0.3.2"
 readme = "README.md"
 description = "Tool for interaction with Playdate device and sim."
 keywords = ["playdate", "usb", "utility"]

diff --git a/support/tool/src/cli.rs b/support/tool/src/cli.rs
@@ -141,7 +141,7 @@ pub struct Install {
 	pub pdx: PathBuf,
 
 	/// Allow to overwrite existing files.
-	#[arg(long, default_value_t = false)]
+	#[arg(long, short, default_value_t = false)]
 	pub force: bool,
 
 	#[command(flatten)]