Browse Source

Merge pull request #2168 from slingamn/fix_defaultconfig

don't require a config file for defaultconfig
tags/v2.14.0-rc1^0
Shivaram Lingamneni 3 weeks ago
parent
commit
2aec5e167c
No account linked to committer's email address
1 changed files with 3 additions and 2 deletions
  1. 3
    2
      ergo.go

+ 3
- 2
ergo.go View File

138
 		}
138
 		}
139
 		fmt.Println(string(hash))
139
 		fmt.Println(string(hash))
140
 		return
140
 		return
141
+	} else if arguments["defaultconfig"].(bool) {
142
+		fmt.Print(defaultConfig)
143
+		return
141
 	} else if arguments["mkcerts"].(bool) {
144
 	} else if arguments["mkcerts"].(bool) {
142
 		doMkcerts(arguments["--conf"].(string), arguments["--quiet"].(bool))
145
 		doMkcerts(arguments["--conf"].(string), arguments["--quiet"].(bool))
143
 		return
146
 		return
178
 		if err != nil {
181
 		if err != nil {
179
 			log.Fatal("Error while importing db:", err.Error())
182
 			log.Fatal("Error while importing db:", err.Error())
180
 		}
183
 		}
181
-	} else if arguments["defaultconfig"].(bool) {
182
-		fmt.Print(defaultConfig)
183
 	} else if arguments["run"].(bool) {
184
 	} else if arguments["run"].(bool) {
184
 		if !arguments["--quiet"].(bool) {
185
 		if !arguments["--quiet"].(bool) {
185
 			logman.Info("server", fmt.Sprintf("%s starting", irc.Ver))
186
 			logman.Info("server", fmt.Sprintf("%s starting", irc.Ver))

Loading…
Cancel
Save