Merge branches 'development' and 'development' of ssh://git.tcp.direct:2222/freqy/protomolecule into development

main.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-	//"flag"
+	"flag"
 	"os"
 	"protomolecule/src/dust"
 	"protomolecule/src/eros"
@@ -56,25 +56,12 @@ func init() {
 
 	// suppress debug messages unless -d is called
 	zerolog.SetGlobalLevel(zerolog.InfoLevel)
-	for _, arg := range os.Args {
-		if arg == "-d" {
-			zerolog.SetGlobalLevel(zerolog.DebugLevel)
-		}
-	}
+
 	log.Debug().Msg("Logging initialized")
 
 	log.Debug().Msg("Initializing database engine")
 	// initialize database engine
 	eros.Awaken()
-
-	for _, flag := range os.Args {
-
-		if flag == "-A" {
-			projVars.AttackMode = true
-		}
-
-	}
-
 }
 
 func main() {
@@ -82,8 +69,6 @@ func main() {
 	var scanID int
 	var scan *scanStuff.Scan
 
-	//values := flag.Args()
-
 	scanID = ScanMgr.NewScan()
 	scan = ScanMgr.Scans[scanID]
 

src/vars/projVars.go

@@ -34,7 +34,19 @@ var ScanAdapter = bluetooth.DefaultAdapter
 var AttackAdapter = bluetooth.DefaultAdapter
 
 //Device to be targeted --not fully implemented
-var Target = flag.String("t", "00:00:00:00:00:00", "Target device to attack")
+//var Target = flag.String("t", "00:00:00:00:00:00", "Target device to attack")
+var dFlag = flag.Bool("d", false, "global debug logging and pretty printing")
+var aFlag = flag.Bool("a", false, "attack mode")
+
+flag.Parse()
+
+if *aFlag {
+	projVars.AttackMode = true
+}
+
+if *dFlag {
+	zerolog.SetGlobalLevel(zerolog.DebugLevel)
+}
 
 //var attacker bluetooth.Addresser
 //var connected bool