Merge branch 'main' of github.com:binwiederhier/ntfy
This commit is contained in:
commit
72d4f67524
2 changed files with 2 additions and 2 deletions
2
.github/ISSUE_TEMPLATE/1_bug_report.md
vendored
2
.github/ISSUE_TEMPLATE/1_bug_report.md
vendored
|
@ -2,7 +2,7 @@
|
||||||
name: 🐛 Bug Report
|
name: 🐛 Bug Report
|
||||||
about: Report any errors and problems
|
about: Report any errors and problems
|
||||||
title: ''
|
title: ''
|
||||||
labels: 'bug'
|
labels: '🪲 bug'
|
||||||
assignees: ''
|
assignees: ''
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
|
@ -171,7 +171,7 @@ func execPublish(c *cli.Context) error {
|
||||||
fmt.Fprintf(c.App.ErrWriter, "\r%s\r", strings.Repeat(" ", 20))
|
fmt.Fprintf(c.App.ErrWriter, "\r%s\r", strings.Repeat(" ", 20))
|
||||||
}
|
}
|
||||||
options = append(options, client.WithBasicAuth(user, pass))
|
options = append(options, client.WithBasicAuth(user, pass))
|
||||||
} else if conf.DefaultUser != "" && conf.DefaultPassword != nil {
|
} else if token == "" && conf.DefaultUser != "" && conf.DefaultPassword != nil {
|
||||||
options = append(options, client.WithBasicAuth(conf.DefaultUser, *conf.DefaultPassword))
|
options = append(options, client.WithBasicAuth(conf.DefaultUser, *conf.DefaultPassword))
|
||||||
}
|
}
|
||||||
if pid > 0 {
|
if pid > 0 {
|
||||||
|
|
Loading…
Reference in a new issue