cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 87 Pull Requests 1 Projects 2 Releases 28 Wiki Activity

ffi on windows more options to detect tor; nsis installer warn about cwtch needing exiting
continuous-integration/drone/pr Build is passing Details

This commit is contained in:
Dan Ballard 2022-04-20 18:19:36 -07:00
parent a6c7682c84
commit a3d986d9d6
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cwtch/ffi.dart
View File

@ -160,7 +160,13 @@ class CwtchFfi implements Cwtch {
}
} else if (Platform.isWindows) {
cwtchDir = envVars['CWTCH_DIR'] ?? path.join(envVars['UserProfile']!, ".cwtch");
bundledTor = "Tor\\Tor\\tor.exe";
String currentTor = path.join(Directory.current.absolute.path, "Tor\\Tor\\tor.exe");
if (await File(currentTor).exists()) {
bundledTor = currentTor;
} else {
String exeDir = path.dirname(Platform.resolvedExecutable);
bundledTor = path.join(exeDir, "Tor\\Tor\\tor.exe");
}
} 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()) {

16
windows/nsis/cwtch-installer.nsi
View File

@ -45,23 +45,15 @@ InstallDirRegKey HKCU "Software\Cwtch" "installLocation"
ShowInstDetails show
; Init / make sure isn't running
; https://nsis.sourceforge.io/Check_whether_your_application_is_running
Function .onInit
FindProcDLL::FindProc "Cwtch.exe"
StrCmp $R0 "1" found not_found
found:
MessageBox MB_ICONEXCLAMATION|MB_OK "Cwtch is still running, please exit it before running installer" /SD IDOK
Abort
not_found:
; Pages --------
!define MUI_WELCOMEPAGE_TITLE "Welcome to the Cwtch installer"
!define MUI_WELCOMEPAGE_TEXT "Cwtch (pronounced: kutch) is a Welsh word roughly meaning 'a hug that creates a safe space'$\n$\n\
Cwtch is a platform for building consentful, decentralized, untrusted infrastructure using metadata resistant group communication applications. Currently there is a selfnamed instant messaging prototype app that is driving development and testing. Many Further apps are planned as the platform matures."
Cwtch is a platform for building consentful, decentralized, untrusted infrastructure using metadata resistant group communication applications. Currently there is a selfnamed instant messaging prototype app that is driving development and testing. Many Further apps are planned as the platform matures.$\n$\n\
Please close any running copies of Cwtch before installing a new version."
; Detecting if Cwtch is running and reminding the user or closing it appears to require 3rd party plugins that take the form of decade+ old .dlls in zips from a wiki...
!define MUI_FINISHPAGE_TITLE "Enjoy Cwtch"
!define MUI_FINISHPAGE_RUN $INSTDIR/cwtch.exe