Mirror/rayhunter
1
0
Fork 0
mirror of https://github.com/EFForg/rayhunter.git synced 2026-04-26 23:49:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Always include firmware binaries statically into installer

Browse Source
This commit is contained in:
Sashanoraa
2025-05-15 23:24:45 -04:00
committed by Cooper Quintin
parent a2269fb5f7
commit d6e4f6a71d
6 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
installer/src/orbic.rs
View File

@@ -70,13 +70,7 @@ async fn setup_rootshell(
serial_interface: &Interface,
adb_device: &mut ADBUSBDevice,
) -> Result<()> {
#[cfg(feature = "vendor")]
let rootshell_bin = include_bytes!("../../rootshell/rootshell");
#[cfg(not(feature = "vendor"))]
let rootshell_bin = &tokio::fs::read("target/armv7-unknown-linux-musleabihf/release/rootshell")
.await
.context("Error reading rootshell from local file system")?;
let rootshell_bin = include_bytes!(env!("FILE_ROOTSHELL"));
install_file(
serial_interface,
@@ -100,14 +94,7 @@ async fn setup_rayhunter(
serial_interface: &Interface,
mut adb_device: ADBUSBDevice,
) -> Result<ADBUSBDevice> {
#[cfg(feature = "vendor")]
let rayhunter_daemon_bin = include_bytes!("../../rayhunter-daemon-orbic/rayhunter-daemon");
#[cfg(not(feature = "vendor"))]
let rayhunter_daemon_bin =
&tokio::fs::read("target/armv7-unknown-linux-musleabihf/release/rayhunter-daemon")
.await
.context("Error reading rayhunter-daemon from local file system")?;
let rayhunter_daemon_bin = include_bytes!(env!("FILE_RAYHUNTER_DAEMON_ORBIC"));
at_syscmd(serial_interface, "mkdir -p /data/rayhunter").await?;
install_file(

7
installer/src/tplink.rs
View File

@@ -114,12 +114,7 @@ async fn tplink_run_install(skip_sdcard: bool, admin_ip: String) -> Result<(), E
)
.await?;
#[cfg(feature = "vendor")]
let rayhunter_daemon_bin = include_bytes!("../../rayhunter-daemon-tplink/rayhunter-daemon");
#[cfg(not(feature = "vendor"))]
let rayhunter_daemon_bin =
&tokio::fs::read("target/armv7-unknown-linux-musleabihf/release/rayhunter-daemon").await?;
let rayhunter_daemon_bin = include_bytes!(env!("FILE_RAYHUNTER_DAEMON_TPLINK"));
telnet_send_file(addr, "/media/card/rayhunter-daemon", rayhunter_daemon_bin).await?;
telnet_send_file(