Merge pull request 'Fix MacOS DMG Location' (#171 ) from fyne/cwtch-ui:fix-macos-dmg-location into trunk

Reviewed-on: cwtch.im/cwtch-ui#171
Merge pull request 'gitignore more libcwtch/tor binaries' (#178 ) from mal/cwtch-ui:gitignore into trunk
2021-09-09 00:24:09 +00:00 · 2021-09-08 23:12:27 +00:00 · 2021-09-08 22:32:09 +00:00 · 2021-09-08 22:31:58 +00:00 · 2021-09-08 18:36:13 +00:00 · 2021-09-08 13:03:25 -04:00
3 changed files with 20 additions and 4 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -154,7 +154,7 @@ volumes:
    temp: {}

 trigger:
-  repo: cwtch.im/cwtch-ui
+  #repo: cwtch.im/cwtch-ui # allow forks to build?
  branch: trunk
  event:
    - push
@ -271,7 +271,7 @@ steps:
      - scp -r -o StrictHostKeyChecking=no -i id_rsa deploy\\* buildfiles@build.openprivacy.ca:/home/buildfiles/buildfiles/

 trigger:
-  repo: cwtch.im/cwtch-ui
+  # repo: cwtch.im/cwtch-ui # allow forks to build?
  branch: trunk
  event:
    - push
--- a/.gitignore
+++ b/.gitignore
@ -40,8 +40,10 @@ app.*.symbols
 # Obfuscation related
 app.*.map.json

-libCwtch.so
+linux/tor
+linux/libCwtch.so
 android/cwtch/cwtch.aar
+android/app/src/main/jniLibs/*/libtor.so
 coverage
 test/failures
-.gradle
+.gradle
--- a/lib/cwtch/ffi.dart
+++ b/lib/cwtch/ffi.dart
@ -117,8 +117,22 @@ class CwtchFfi implements Cwtch {
      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";
+        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";
+          }
+        }
      }
    }
Author	SHA1	Message	Date
Dan Ballard	4c46620733	Merge pull request 'Fix MacOS DMG Location' (#171 ) from fyne/cwtch-ui:fix-macos-dmg-location into trunk Reviewed-on: cwtch.im/cwtch-ui#171	2021-09-09 00:24:09 +00:00
Dan Ballard	652892af4c	Merge pull request 'gitignore more libcwtch/tor binaries' (#178 ) from mal/cwtch-ui:gitignore into trunk Reviewed-on: cwtch.im/cwtch-ui#178	2021-09-08 23:12:27 +00:00
Sarah Jamie Lewis	dc69d34484	Merge pull request 'drone checkout from forked repo' (#179 ) from dan/cwtch-ui:drone-fork into trunk Reviewed-on: cwtch.im/cwtch-ui#179	2021-09-08 22:32:09 +00:00
Sarah Jamie Lewis	9abee953a6	Merge branch 'trunk' into drone-fork	2021-09-08 22:31:58 +00:00
fyne	86dd8d7f78	Merge branch 'trunk' into fix-macos-dmg-location	2021-09-08 18:36:13 +00:00
Trevor Bergeron	34793ca459	gitignore more libcwtch/tor binaries	2021-09-08 13:03:25 -04:00
Dan Ballard	cafac4aa19	drone checkout from forked repo	2021-09-08 09:56:40 -07:00
fyne	be0c4f4d64	Leave the Cwtch.app local path in	2021-09-04 18:48:49 +01:00
fyne	b53f43d946	Allow the fallback to the Tor Browser tor.real	2021-09-04 14:41:01 +01:00
fyne	13f76d1861	Attempt to fix #166 Add better checks	2021-09-04 14:34:42 +01:00