gofmt

Author: naiba

cmd/nc.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/naiba/nb/singleton"
 	"github.com/urfave/cli/v2"
+
+	"github.com/naiba/nb/singleton"
 )
 
 func init() {

cmd/print_banner.go

@@ -5,9 +5,10 @@ import (
 	"os"
 
 	"github.com/dimiro1/banner"
+	"github.com/urfave/cli/v2"
+
 	"github.com/naiba/nb/assets"
 	"github.com/naiba/nb/singleton"
-	"github.com/urfave/cli/v2"
 )
 
 func init() {

cmd/print_config.go

@@ -3,8 +3,9 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/naiba/nb/singleton"
 	"github.com/urfave/cli/v2"
+
+	"github.com/naiba/nb/singleton"
 )
 
 func init() {

cmd/print_snippet.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/naiba/nb/singleton"
 	"github.com/urfave/cli/v2"
+
+	"github.com/naiba/nb/singleton"
 )
 
 func init() {

cmd/root.go

@@ -5,9 +5,9 @@ import (
 	"net"
 	"os"
 
-	"github.com/naiba/nb/singleton"
-
 	"github.com/urfave/cli/v2"
+
+	"github.com/naiba/nb/singleton"
 )
 
 var rootCmd = &cli.App{

cmd/rsync.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/naiba/nb/singleton"
 	"github.com/urfave/cli/v2"
+
+	"github.com/naiba/nb/singleton"
 )
 
 func init() {

cmd/run.go

@@ -1,11 +1,11 @@
 package cmd
 
 import (
+	"os"
 	"runtime"
 	"strings"
 
 	"github.com/AppleGamer22/cocainate/session"
-
 	"github.com/urfave/cli/v2"
 )
 
@@ -45,22 +45,24 @@ var beepCmd = &cli.Command{
 	},
 }
 
-var s session.Session
+var s *session.Session
 
 var awakeCmd = &cli.Command{
 	Name:            "awake",
 	Aliases:         []string{"a"},
 	Usage:           "Awake during the command is running.",
 	SkipFlagParsing: true,
 	Before: func(c *cli.Context) error {
-		s = session.Session{}
+		s = session.New(0, os.Getppid())
 		return s.Start()
 	},
 	Action: func(c *cli.Context) error {
-		return ExecuteLineInHost(strings.Join(c.Args().Slice(), " "))
-	},
-	After: func(c *cli.Context) error {
-		return s.Stop()
+		retCmd := ExecuteLineInHost(strings.Join(c.Args().Slice(), " "))
+		retSession := s.Stop()
+		if retCmd != nil {
+			return retCmd
+		}
+		return retSession
 	},
 }
 
@@ -70,13 +72,15 @@ var awakeBeepCmd = &cli.Command{
 	Usage:           "Awake and beep when an command is finished.",
 	SkipFlagParsing: true,
 	Before: func(c *cli.Context) error {
-		s = session.Session{}
+		s = session.New(0, os.Getppid())
 		return s.Start()
 	},
 	Action: func(c *cli.Context) error {
-		return beepCmd.Action(c)
-	},
-	After: func(c *cli.Context) error {
-		return s.Stop()
+		retCmd := beepCmd.Action(c)
+		retSession := s.Stop()
+		if retCmd != nil {
+			return retCmd
+		}
+		return retSession
 	},
 }

cmd/scp.go

@@ -4,8 +4,9 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/naiba/nb/singleton"
 	"github.com/urfave/cli/v2"
+
+	"github.com/naiba/nb/singleton"
 )
 
 func init() {

cmd/ssh.go

@@ -7,10 +7,11 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/naiba/nb/model"
-	"github.com/naiba/nb/singleton"
 	"github.com/urfave/cli/v2"
 	"golang.org/x/crypto/ssh"
+
+	"github.com/naiba/nb/model"
+	"github.com/naiba/nb/singleton"
 )
 
 func init() {

singleton/singleton.go

@@ -6,10 +6,6 @@ import (
 
 var Config *model.Config
 
-func init() {
-
-}
-
 func Init(confPath string) error {
 	var err error
 	Config, err = model.ReadInConfig(confPath)