diff --git a/doc/installing-from-release-windows.md b/doc/installing-from-release-windows.md index 2b318e7..00106cb 100644 --- a/doc/installing-from-release-windows.md +++ b/doc/installing-from-release-windows.md @@ -25,8 +25,8 @@ Windows support in Rayhunter's installer is a work-in-progress. Depending on the 2. Download the latest `rayhunter-vX.X.X.zip` from the [Rayhunter releases page](https://github.com/EFForg/rayhunter/releases). The version you download will have numbers instead of X 3. Unzip `rayhunter-vX.X.X` . 1. Open a powershell terminal by pressing Win+R and typing `powershell` and hitting enter. -5. Run the following powershell command `Set-ExecutionPolicy remotesigned` -5. Run the install script by double clicking on `install.ps1`. A powershell window will launch. - The device will restart multiple times over the next few minutes. - You will know it is done when you see terminal output that says `checking for rayhunter server...success!` +5. Type `cd ~\Downloads\rayhunter-v\installer-windows-x86_64` (**Replace with the rayhunter version you just unzipped**) and hit enter. +5. Run the install script: `.\installer.exe orbic` and hit enter. + - The device will restart multiple times over the next few minutes. + - You will know it is done when you see terminal output that says `checking for rayhunter server...success!` 6. Rayhunter should now be running! You can verify this by following the instructions below to [view the web UI](#usage-viewing-the-web-ui). You should also see a green line flash along the top of top the display on the device. diff --git a/installer/src/orbic.rs b/installer/src/orbic.rs index 9bb883c..b972822 100644 --- a/installer/src/orbic.rs +++ b/installer/src/orbic.rs @@ -22,10 +22,10 @@ const ORBIC_BUSY: &str = r#"The Orbic is plugged in but is being used by another Please close any program that might be using your USB devices. If you have adb installed you may need to kill the adb daemon"#; -#[cfg(target_os = "macos")] +#[cfg(any(target_os = "macos", target_os = "windows"))] const ORBIC_BUSY_MAC: &str = r#"Permission denied. -On macOS this might be caused by another program using the Orbic. +On macOS or windows this might be caused by another program using the Orbic. Please close any program that might be using your Orbic. If you have adb installed you may need to kill the adb daemon"#; @@ -250,7 +250,7 @@ async fn get_adb() -> Result { Err(RustADBError::IOError(e)) if e.kind() == ErrorKind::ResourceBusy => { bail!(ORBIC_BUSY); } - #[cfg(target_os = "macos")] + #[cfg(any(target_os = "macos", target_os="windows"))] Err(RustADBError::IOError(e)) if e.kind() == ErrorKind::PermissionDenied => { bail!(ORBIC_BUSY_MAC); }