Skip to content

fix #2157 #2160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slingamn merged 1 commit into from
May 29, 2024
Merged

fix #2157 #2160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions ergo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main

import (
"bufio"
_ "embed"
"fmt"
"log"
"os"
Expand All @@ -26,6 +27,9 @@ import (
var commit = "" // git hash
var version = "" // tagged version

//go:embed default.yaml
var defaultConfig string

// get a password from stdin from the user
func getPasswordFromTerminal() string {
bytePassword, err := term.ReadPassword(int(syscall.Stdin))
Expand Down Expand Up @@ -94,6 +98,7 @@ Usage:
ergo importdb <database.json> [--conf <filename>] [--quiet]
ergo genpasswd [--conf <filename>] [--quiet]
ergo mkcerts [--conf <filename>] [--quiet]
ergo defaultconfig
ergo run [--conf <filename>] [--quiet] [--smoke]
ergo -h | --help
ergo --version
Expand Down Expand Up @@ -173,6 +178,8 @@ Options:
if err != nil {
log.Fatal("Error while importing db:", err.Error())
}
} else if arguments["defaultconfig"].(bool) {
fmt.Print(defaultConfig)
} else if arguments["run"].(bool) {
if !arguments["--quiet"].(bool) {
logman.Info("server", fmt.Sprintf("%s starting", irc.Ver))
Expand Down