2 Commits

Author SHA1 Message Date
uli
e36f0b4f66 removed removed call to SetTimezone 2022-05-30 22:30:02 +02:00
uli
b7d8d4376d added setting of timezone 2022-05-29 23:39:16 +02:00
3 changed files with 7 additions and 43 deletions

View File

@@ -4,8 +4,8 @@ SERVICE_PREFIX = $(DESTDIR)$(PREFIX)/lib/systemd/user
CFG_PREFIX = $(DESTDIR)/etc
all: version.txt
go build
go build ./cmd/itctl
go build $(GOFLAGS)
go build ./cmd/itctl $(GOFLAGS)
clean:
rm -f itctl

View File

@@ -1,7 +1,6 @@
package main
import (
"time"
"context"
"os"
"os/signal"
@@ -25,17 +24,8 @@ func main() {
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{
Name: "itctl",
HideHelpCommand: true,
Flags: []cli.Flag{
&cli.StringFlag{
Name: "socket-path",
@@ -45,12 +35,6 @@ func main() {
},
},
Commands: []*cli.Command{
{
Name: "help",
ArgsUsage: "<command>",
Usage: "Display help screen for a command",
Action: helpCmd,
},
{
Name: "filesystem",
Aliases: []string{"fs"},
@@ -245,13 +229,11 @@ func main() {
},
},
Before: func(c *cli.Context) error {
if !isHelpCmd() {
newClient, err := api.New(c.String("socket-path"))
if err != nil {
return err
}
client = newClient
newClient, err := api.New(c.String("socket-path"))
if err != nil {
return err
}
client = newClient
return nil
},
After: func(*cli.Context) error {
@@ -267,21 +249,3 @@ func main() {
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
}