cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

Merge branch 'dev-profiles' of dan/ui into master
the build failed Details

This commit is contained in:
Sarah Jamie Lewis 2019-09-30 11:28:00 -07:00 committed by Gogs
parent 45973dfaf4 f3a453f5a6
commit 62911b03fa
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
go/characters/appEventListener.go
View File

@ -56,8 +56,11 @@ func AppEventListener(gcd *gothings.GrandCentralDispatcher, subscribed chan bool
if e.Data[event.Error] == event.AppErrLoaded0 { if e.Data[event.Error] == event.AppErrLoaded0 {
// TODO: only an error if other profiles are not loaded // TODO: only an error if other profiles are not loaded
log.Infoln("couldn't load your config file. attempting to create one now") log.Infoln("couldn't load your config file. attempting to create one now")
if gcd.Version() == "development" {
the.CwtchApp.CreatePeer("alice", the.AppPassword) the.CwtchApp.CreatePeer("tester", the.AppPassword)
} else {
the.CwtchApp.CreatePeer("alice", the.AppPassword)
}
} }
case event.ReloadDone: case event.ReloadDone:

10
main.go
View File

@ -57,7 +57,9 @@ func main() {
} }
// TESTING // TESTING
//log.SetLevel(log.LevelDebug) if buildVer == "" {
log.SetLevel(log.LevelDebug)
}
//log.ExcludeFromPattern("connection/connection") //log.ExcludeFromPattern("connection/connection")
//log.ExcludeFromPattern("outbound/3dhauthchannel") //log.ExcludeFromPattern("outbound/3dhauthchannel")
//log.AddNothingExceptFilter("event/eventmanager") //log.AddNothingExceptFilter("event/eventmanager")
@ -74,6 +76,12 @@ func main() {
} }
the.CwtchDir = path.Join(usr.HomeDir, ".cwtch") the.CwtchDir = path.Join(usr.HomeDir, ".cwtch")
} }
if buildVer == "" && os.Getenv("CWTCH_FOLDER") == "" {
log.Infoln("Development build: using dev directory for dev profiles")
the.CwtchDir = path.Join(the.CwtchDir, "dev")
}
the.ACN = nil the.ACN = nil
the.Peer = nil the.Peer = nil
the.IPCBridge = nil the.IPCBridge = nil