From c09f10b6508ca96b724f32eba7951d7f7f829428 Mon Sep 17 00:00:00 2001 From: Dan Ballard Date: Wed, 29 Nov 2023 12:08:06 -0800 Subject: [PATCH] fix update scripts to tor 0.4.8.9 mac --- lib/cwtch/ffi.dart | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/cwtch/ffi.dart b/lib/cwtch/ffi.dart index ec0f9197..aeb81df9 100644 --- a/lib/cwtch/ffi.dart +++ b/lib/cwtch/ffi.dart @@ -199,22 +199,22 @@ class CwtchFfi implements Cwtch { } } else if (Platform.isMacOS) { cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, "Library/Application Support/Cwtch"); - if (await File("Cwtch.app/Contents/MacOS/Tor/tor.real").exists()) { - bundledTor = "Cwtch.app/Contents/MacOS/Tor/tor.real"; - } else if (await File("/Applications/Cwtch.app/Contents/MacOS/Tor/tor.real").exists()) { - bundledTor = "/Applications/Cwtch.app/Contents/MacOS/Tor/tor.real"; - } else if (await File("/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor.real").exists()) { - bundledTor = "/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor.real"; - } else if (await File("/Applications/Tor Browser.app/Contents/MacOS/Tor/tor.real").exists()) { - bundledTor = "/Applications/Tor Browser.app/Contents/MacOS/Tor/tor.real"; + if (await File("Cwtch.app/Contents/MacOS/Tor/tor").exists()) { + bundledTor = "Cwtch.app/Contents/MacOS/Tor/tor"; + } else if (await File("/Applications/Cwtch.app/Contents/MacOS/Tor/tor").exists()) { + bundledTor = "/Applications/Cwtch.app/Contents/MacOS/Tor/tor"; + } else if (await File("/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor").exists()) { + bundledTor = "/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor"; + } else if (await File("/Applications/Tor Browser.app/Contents/MacOS/Tor/tor").exists()) { + bundledTor = "/Applications/Tor Browser.app/Contents/MacOS/Tor/tor"; print("We couldn't find Tor in the Cwtch app directory, however we can fall back to the Tor Browser binary"); } else { var splitPath = path.split(dirname(Platform.script.path)); if (splitPath[0] == "/" && splitPath[1] == "Applications") { var appName = splitPath[2]; print("We're running in /Applications in a non standard app name: $appName"); - if (await File("/Applications/$appName/Contents/MacOS/Tor/tor.real").exists()) { - bundledTor = "/Applications/$appName/Contents/MacOS/Tor/tor.real"; + if (await File("/Applications/$appName/Contents/MacOS/Tor/tor").exists()) { + bundledTor = "/Applications/$appName/Contents/MacOS/Tor/tor"; } } }