make RUST_BACKTRACE overwritable by --env

sonos · Jun 29, 2023 · 75180c8 · 75180c8
1 parent f22f0bd
commit 75180c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dinghy-lib/src/android/device.rs b/dinghy-lib/src/android/device.rs
@@ -235,7 +235,7 @@ impl Device for AndroidDevice {
             .collect();
         let (build_bundle, remote_bundle) = self.install_app(&project, &build)?;
         let command = format!(
-                "cd '{}'; {} DINGHY=1 RUST_BACKTRACE=1 LD_LIBRARY_PATH=\"{}:$LD_LIBRARY_PATH\" {} {} ; echo FORWARD_RESULT_TO_DINGHY_BECAUSE_ADB_DOES_NOT=$?",
+                "cd '{}'; RUST_BACKTRACE=1 {} DINGHY=1 LD_LIBRARY_PATH=\"{}:$LD_LIBRARY_PATH\" {} {} ; echo FORWARD_RESULT_TO_DINGHY_BECAUSE_ADB_DOES_NOT=$?",
                 path_to_str(&remote_bundle.bundle_dir)?,
                 envs.join(" "),
                 path_to_str(&remote_bundle.lib_dir)?,

diff --git a/dinghy-lib/src/ssh/device.rs b/dinghy-lib/src/ssh/device.rs
@@ -228,7 +228,7 @@ impl Device for SshDevice {
         let (build_bundle, remote_bundle) = self.install_app(&project, &build)?;
         log::debug!("Installed {:?}", build.runnable.id);
         let command = format!(
-            "cd '{}' ; {} RUST_BACKTRACE=1 DINGHY=1 LD_LIBRARY_PATH=\"{}:$LD_LIBRARY_PATH\" {} {}",
+            "cd '{}' ; RUST_BACKTRACE=1 {} DINGHY=1 LD_LIBRARY_PATH=\"{}:$LD_LIBRARY_PATH\" {} {}",
             path_to_str(&remote_bundle.bundle_dir)?,
             envs.join(" "),
             path_to_str(&remote_bundle.lib_dir)?,