From 3ff2e035efa4dcdaa73c1eb9c5d01e2f722281bf Mon Sep 17 00:00:00 2001
From: Tit Petric <black@scene-si.org>
Date: Tue, 5 Feb 2019 15:25:16 +0100
Subject: [PATCH] upd(all): update cmd, add internal/mail to all

---
 cmd/crm/main.go       | 19 +++++++++++++++----
 cmd/messaging/main.go | 20 ++++++++++++++++----
 cmd/system/main.go    | 10 +++++-----
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/cmd/crm/main.go b/cmd/crm/main.go
index c7c18241a..d32f26eac 100644
--- a/cmd/crm/main.go
+++ b/cmd/crm/main.go
@@ -5,9 +5,9 @@ import (
 	"os"
 
 	service "github.com/crusttech/crust/crm"
-	"github.com/crusttech/crust/internal/mail"
 
 	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/rbac"
 )
 
@@ -19,9 +19,20 @@ func main() {
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 
 	if err := service.Init(); err != nil {
-		log.Fatalf("Error initializing crm: %+v", err)
+		log.Fatalf("Error initializing: %+v", err)
 	}
-	if err := service.Start(); err != nil {
-		log.Fatalf("Error starting/running crm: %+v", err)
+
+	var command string
+	if len(os.Args) > 1 {
+		command = os.Args[1]
+	}
+
+	switch command {
+	case "help":
+	case "merge-users":
+	default:
+		if err := service.Start(); err != nil {
+			log.Fatalf("Error starting/running: %+v", err)
+		}
 	}
 }
diff --git a/cmd/messaging/main.go b/cmd/messaging/main.go
index abd463e76..7b794ca4c 100644
--- a/cmd/messaging/main.go
+++ b/cmd/messaging/main.go
@@ -7,20 +7,32 @@ import (
 	service "github.com/crusttech/crust/messaging"
 
 	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/rbac"
 )
 
 func main() {
-	flags("messaging", service.Flags, auth.Flags, rbac.Flags)
+	flags("messaging", service.Flags, auth.Flags, rbac.Flags, mail.Flags)
 
 	// log to stdout not stderr
 	log.SetOutput(os.Stdout)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 
 	if err := service.Init(); err != nil {
-		log.Fatalf("Error initializing sam: %+v", err)
+		log.Fatalf("Error initializing: %+v", err)
 	}
-	if err := service.Start(); err != nil {
-		log.Fatalf("Error starting/running sam: %+v", err)
+
+	var command string
+	if len(os.Args) > 1 {
+		command = os.Args[1]
+	}
+
+	switch command {
+	case "help":
+	case "merge-users":
+	default:
+		if err := service.Start(); err != nil {
+			log.Fatalf("Error starting/running: %+v", err)
+		}
 	}
 }
diff --git a/cmd/system/main.go b/cmd/system/main.go
index d9edf7cd8..b5bbcdd65 100644
--- a/cmd/system/main.go
+++ b/cmd/system/main.go
@@ -4,21 +4,22 @@ import (
 	"log"
 	"os"
 
-	"github.com/crusttech/crust/system"
+	service "github.com/crusttech/crust/system"
 
 	"github.com/crusttech/crust/internal/auth"
+	"github.com/crusttech/crust/internal/mail"
 	"github.com/crusttech/crust/internal/rbac"
 )
 
 func main() {
-	flags("system", service.Flags, auth.Flags, rbac.Flags)
+	flags("system", service.Flags, auth.Flags, rbac.Flags, mail.Flags)
 
 	// log to stdout not stderr
 	log.SetOutput(os.Stdout)
 	log.SetFlags(log.LstdFlags | log.Lshortfile)
 
 	if err := service.Init(); err != nil {
-		log.Fatalf("Error initializing system: %+v", err)
+		log.Fatalf("Error initializing: %+v", err)
 	}
 
 	var command string
@@ -31,8 +32,7 @@ func main() {
 	case "merge-users":
 	default:
 		if err := service.Start(); err != nil {
-			log.Fatalf("Error starting/running system: %+v", err)
+			log.Fatalf("Error starting/running: %+v", err)
 		}
 	}
-
 }