urdt/ussd
5
0
Fork 1
Code Issues 58 Pull Requests 6 Actions 1 Packages Projects Releases Wiki Activity

Implement connstring handling #247

Open
lash wants to merge 27 commits from lash/purify-more into master
pull from: lash/purify-more
merge into: urdt:master
Conversation 0 Commits 27 Files Changed 18 +1 -11
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 599815c343 - Show all commits

12
cmd/main.go
View File

@ -88,22 +88,12 @@ func main() {
MenuSeparator: menuSeparator,
}
<<<<<<< HEAD
menuStorageService := storage.NewMenuStorageService(connData, resourceDir)
=======
resourceDir := scriptDir
menuStorageService := storage.NewMenuStorageService(dbDir, resourceDir)
if gettextDir != "" {
menuStorageService = menuStorageService.WithGettext(gettextDir, langs.Langs())
}
err = menuStorageService.EnsureDbDir()
if err != nil {
fmt.Fprintf(os.Stderr, err.Error())
os.Exit(1)
}
>>>>>>> master
rs, err := menuStorageService.GetResource(ctx)
if err != nil {
fmt.Fprintf(os.Stderr, err.Error())