Merge branch 'system-proxy' of https://github.com/rivethorn/MasterHttpRelayVPN-RUST into system-proxy

Author: rivethorn

scripts/proxy_set_osx_sh

@@ -63,7 +63,7 @@ is_proxy_enabled() {
     # Loop through each network service
     echo "$SERVICES" | while read -r SERVICE; do
         # Check if HTTP proxy is enabled
-        HTTP_PROXY_STATE=$(networksetup -getwebproxy "$SERVICE" | grep "Enabled:" | awk '{print $2}')
+        HTTP_PROXY_STATE=$(networksetup -getwebproxy "$SERVICE" | grep "Enabled:" | awk '{print $2}' | grep -v 'Proxy')
         if [ "$HTTP_PROXY_STATE" == "Yes" ]; then
             echo "Proxy is currently enabled for network service '$SERVICE'"
             return 0

src/system_proxy.rs

@@ -21,9 +21,11 @@ pub fn check_system_proxy() -> std::io::Result<bool> {
     }
     #[cfg(target_os = "macos")]
     {
-        run_script(MACOS_SCRIPT, &["check"])
-            .map(|_| true)
-            .or_else(|_| Ok(false))
+        let res = run_script(MACOS_SCRIPT, &["check"]);
+        match res {
+            Ok(()) => Ok(true),
+            Err(_) => Ok(false),
+        }
     }
 }
 
@@ -99,6 +101,7 @@ fn run_script(script_content: &str, args: &[&str]) -> std::io::Result<()> {
 
     if !output.status.success() {
         eprintln!("Script error: {}", String::from_utf8_lossy(&output.stderr));
+        let _ = fs::remove_file(script_path);
         return Err(Error::new(ErrorKind::Other, "Failed to run proxy script"));
     }