Skip to content
This repository was archived by the owner on May 3, 2024. It is now read-only.

Commit 78f51e2

Browse files
committed
update
1 parent eb6d731 commit 78f51e2

File tree

13 files changed

+426
-6
lines changed

13 files changed

+426
-6
lines changed

komanda.go

+17-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package main
22

33
import (
44
"fmt"
5+
"io/ioutil"
6+
"log"
57
"os"
68
"path"
79
"runtime"
@@ -13,6 +15,7 @@ import (
1315
"github.com/mephux/komanda-cli/komanda/config"
1416
"github.com/mephux/komanda-cli/komanda/logger"
1517
"github.com/mephux/komanda-cli/komanda/version"
18+
"github.com/worg/merger"
1619
"gopkg.in/alecthomas/kingpin.v2"
1720
)
1821

@@ -78,6 +81,15 @@ func main() {
7881
logrus.Fatal(err)
7982
}
8083

84+
d := config.Default()
85+
86+
if err := merger.Merge(config.C, d); err != nil {
87+
logrus.Fatal(err)
88+
}
89+
90+
if err := config.C.Save(); err != nil {
91+
logrus.Fatal(err)
92+
}
8193
} else {
8294
config.C = config.Default()
8395

@@ -118,7 +130,11 @@ func main() {
118130
config.C.Server.AutoConnect = *autoConnect
119131
}
120132

121-
logger.Start(config.C.Komanda.LogFile)
133+
if config.C.Komanda.Debug {
134+
logger.Start(config.C.Komanda.LogFile)
135+
} else {
136+
logger.Logger = log.New(ioutil.Discard, "", 0)
137+
}
122138

123139
server := &client.Server{
124140
Address: config.C.Server.Host,

komanda/ui/handlers.go

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ func BindHandlers() {
5050
logger.Logger.Println("IF NICK PASSWORD -----------------------------", spew.Sdump(line))
5151

5252
if len(config.C.Server.NickPassword) > 0 {
53+
logger.Logger.Println("GOT PASSWORD TO SEND -----------------------------", spew.Sdump(config.C.Server.NickPassword))
5354
Server.Client.Privmsg(
5455
"nickserv",
5556
fmt.Sprintf("identify %s", config.C.Server.NickPassword),

vendor/github.com/golang/mock/AUTHORS

+12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/golang/mock/CONTRIBUTORS

+37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/jroimartin/gocui/keybinding.go

+3-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/worg/merger/.gitignore

+23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/worg/merger/LICENSE

+21
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/worg/merger/merger.go

+222
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)