Compare commits
2 Commits
v0.0.6
...
gatt_local
| Author | SHA1 | Date | |
|---|---|---|---|
| e36f0b4f66 | |||
| b7d8d4376d |
4
Makefile
4
Makefile
@@ -4,8 +4,8 @@ SERVICE_PREFIX = $(DESTDIR)$(PREFIX)/lib/systemd/user
|
|||||||
CFG_PREFIX = $(DESTDIR)/etc
|
CFG_PREFIX = $(DESTDIR)/etc
|
||||||
|
|
||||||
all: version.txt
|
all: version.txt
|
||||||
go build
|
go build $(GOFLAGS)
|
||||||
go build ./cmd/itctl
|
go build ./cmd/itctl $(GOFLAGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
rm -f itctl
|
rm -f itctl
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"time"
|
|
||||||
"context"
|
"context"
|
||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
@@ -24,18 +23,9 @@ func main() {
|
|||||||
syscall.SIGINT,
|
syscall.SIGINT,
|
||||||
syscall.SIGTERM,
|
syscall.SIGTERM,
|
||||||
)
|
)
|
||||||
|
|
||||||
// This goroutine ensures that itctl will exit
|
|
||||||
// at most 200ms after the user sends SIGINT/SIGTERM.
|
|
||||||
go func() {
|
|
||||||
<-ctx.Done()
|
|
||||||
time.Sleep(200*time.Millisecond)
|
|
||||||
os.Exit(0)
|
|
||||||
}()
|
|
||||||
|
|
||||||
app := cli.App{
|
app := cli.App{
|
||||||
Name: "itctl",
|
Name: "itctl",
|
||||||
HideHelpCommand: true,
|
|
||||||
Flags: []cli.Flag{
|
Flags: []cli.Flag{
|
||||||
&cli.StringFlag{
|
&cli.StringFlag{
|
||||||
Name: "socket-path",
|
Name: "socket-path",
|
||||||
@@ -45,12 +35,6 @@ func main() {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
Commands: []*cli.Command{
|
Commands: []*cli.Command{
|
||||||
{
|
|
||||||
Name: "help",
|
|
||||||
ArgsUsage: "<command>",
|
|
||||||
Usage: "Display help screen for a command",
|
|
||||||
Action: helpCmd,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
Name: "filesystem",
|
Name: "filesystem",
|
||||||
Aliases: []string{"fs"},
|
Aliases: []string{"fs"},
|
||||||
@@ -245,13 +229,11 @@ func main() {
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
Before: func(c *cli.Context) error {
|
Before: func(c *cli.Context) error {
|
||||||
if !isHelpCmd() {
|
newClient, err := api.New(c.String("socket-path"))
|
||||||
newClient, err := api.New(c.String("socket-path"))
|
if err != nil {
|
||||||
if err != nil {
|
return err
|
||||||
return err
|
|
||||||
}
|
|
||||||
client = newClient
|
|
||||||
}
|
}
|
||||||
|
client = newClient
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
After: func(*cli.Context) error {
|
After: func(*cli.Context) error {
|
||||||
@@ -267,21 +249,3 @@ func main() {
|
|||||||
log.Fatal().Err(err).Msg("Error while running app")
|
log.Fatal().Err(err).Msg("Error while running app")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func helpCmd(c *cli.Context) error {
|
|
||||||
cmdArgs := append([]string{os.Args[0]}, c.Args().Slice()...)
|
|
||||||
cmdArgs = append(cmdArgs, "-h")
|
|
||||||
return c.App.RunContext(c.Context, cmdArgs)
|
|
||||||
}
|
|
||||||
|
|
||||||
func isHelpCmd() bool {
|
|
||||||
if len(os.Args) == 1 {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
for _, arg := range os.Args {
|
|
||||||
if arg == "-h" || arg == "help" {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
@@ -29,7 +29,7 @@ func newProgress(w fyne.Window) progress {
|
|||||||
// Create new rectangle to set the size of the popup
|
// Create new rectangle to set the size of the popup
|
||||||
sizeRect := canvas.NewRectangle(color.Transparent)
|
sizeRect := canvas.NewRectangle(color.Transparent)
|
||||||
sizeRect.SetMinSize(fyne.NewSize(300, 50))
|
sizeRect.SetMinSize(fyne.NewSize(300, 50))
|
||||||
|
|
||||||
// Create vbox for label and progress bar
|
// Create vbox for label and progress bar
|
||||||
l := container.NewVBox(out.lbl, out.pb)
|
l := container.NewVBox(out.lbl, out.pb)
|
||||||
// Create popup
|
// Create popup
|
||||||
|
|||||||
Reference in New Issue
Block a user