1 files changed, 20 insertions, 2 deletions
diff --git a/main.go b/main.go
index 8bfb2f8..c809d25 100644
--- a/main.go
+++ b/main.go
@@ -58,7 +58,8 @@ type ConfigFile struct {
 	S3Bucket    string `json:"s3_bucket"`
 }
 
-var configFlag = flag.String("config", "./config.json", "Configuration file path")
+var fsServer = flag.NewFlagSet("server", flag.ContinueOnError)
+var configFlag = fsServer.String("config", "./config.json", "Configuration file path")
 
 var config *ConfigFile
 
@@ -114,8 +115,25 @@ func getTemplate(name string) *template.Template {
 }
 
 func main() {
-	flag.Parse()
+	if len(os.Args) < 2 {
+		server(os.Args[1:])
+		return
+	}
+
+	switch os.Args[1] {
+		case "cli":
+			cliMain(os.Args[2:])
+		case "server":
+			server(os.Args[2:])
+		default:
+			log.Println("Usage: guichet [server|cli] --help")
+			os.Exit(1)
+	}
+}
 
+func server(args []string) {
+	log.Println("Starting Guichet Server")
+	fsServer.Parse(args)
 	config_file := readConfig()
 	config = &config_file