diff options
author | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
---|---|---|
committer | Mx Kookie <kookie@spacekookie.de> | 2020-12-09 18:55:19 +0000 |
commit | 80d90d9b204f7c17912740f9f414fe5d59f293ba (patch) | |
tree | 5f2065a06e724270610760d59d01c6888b375a46 /infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch | |
parent | 3a31a84c7d3e589035ad08499206aac44a81f424 (diff) | |
parent | 83cbad92d73216bb0d9187c56cce0b91f9121d5a (diff) |
Merge commit '83cbad92d73216bb0d9187c56cce0b91f9121d5a' into main
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch')
-rw-r--r-- | infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch b/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch deleted file mode 100644 index e5df4b8e4fe7..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/networking/gnirehtet/paths.patch +++ /dev/null @@ -1,48 +0,0 @@ -Index: gnirehtet/relay-rust/src/main.rs -=================================================================== ---- gnirehtet.orig/relay-rust/src/main.rs -+++ gnirehtet/relay-rust/src/main.rs -@@ -299,7 +299,7 @@ impl Command for RelayCommand { - - fn cmd_install(serial: Option<&String>) -> Result<(), CommandExecutionError> { - info!(target: TAG, "Installing gnirehtet client..."); -- exec_adb(serial, vec!["install", "-r", "gnirehtet.apk"]) -+ exec_adb(serial, vec!["install", "-r", "@apk@/gnirehtet.apk"]) - } - - fn cmd_uninstall(serial: Option<&String>) -> Result<(), CommandExecutionError> { -@@ -464,8 +464,8 @@ fn exec_adb<S: Into<String>>( - args: Vec<S>, - ) -> Result<(), CommandExecutionError> { - let adb_args = create_adb_args(serial, args); -- debug!(target: TAG, "Execute: adb {:?}", adb_args); -- match process::Command::new("adb").args(&adb_args[..]).status() { -+ debug!(target: TAG, "Execute: @adb@ {:?}", adb_args); -+ match process::Command::new("@adb@").args(&adb_args[..]).status() { - Ok(exit_status) => { - if exit_status.success() { - Ok(()) -@@ -487,8 +487,8 @@ fn must_install_client(serial: Option<&S - serial, - vec!["shell", "dumpsys", "package", "com.genymobile.gnirehtet"], - ); -- debug!(target: TAG, "Execute: adb {:?}", args); -- match process::Command::new("adb").args(&args[..]).output() { -+ debug!(target: TAG, "Execute: @adb@ {:?}", args); -+ match process::Command::new("@adb@").args(&args[..]).output() { - Ok(output) => { - if output.status.success() { - // the "regex" crate makes the binary far bigger, so just parse the versionCode -Index: gnirehtet/relay-rust/src/adb_monitor.rs -=================================================================== ---- gnirehtet.orig/relay-rust/src/adb_monitor.rs -+++ gnirehtet/relay-rust/src/adb_monitor.rs -@@ -206,7 +206,7 @@ impl AdbMonitor { - - fn start_adb_daemon() -> bool { - info!(target: TAG, "Restarting adb daemon"); -- match process::Command::new("adb") -+ match process::Command::new("@adb@") - .args(&["start-server"]) - .status() { - Ok(exit_status) => { |