From befbf3cda533e8caa303465fd23549430d4de4d7 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 9 Mar 2023 14:21:34 -0600 Subject: [PATCH] hostname actually set Signed-off-by: Jeff Carr --- bash.go | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ hostname.go | 10 +++++++-- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 bash.go diff --git a/bash.go b/bash.go new file mode 100644 index 0000000..6daacec --- /dev/null +++ b/bash.go @@ -0,0 +1,58 @@ +package main + +import ( + "io" + "os" + "os/exec" + "os/signal" + "syscall" + + "github.com/creack/pty" + "golang.org/x/term" +) + +func test() error { + // Create arbitrary command. + c := exec.Command("bash") + + // Start the command with a pty. + ptmx, err := pty.Start(c) + if err != nil { + return err + } + // Make sure to close the pty at the end. + defer func() { _ = ptmx.Close() }() // Best effort. + + // Handle pty size. + ch := make(chan os.Signal, 1) + signal.Notify(ch, syscall.SIGWINCH) + go func() { + for range ch { + if err := pty.InheritSize(os.Stdin, ptmx); err != nil { + log("error resizing pty: %s", err) + } + } + }() + ch <- syscall.SIGWINCH // Initial resize. + defer func() { signal.Stop(ch); close(ch) }() // Cleanup signals when done. + + // Set stdin in raw mode. + oldState, err := term.MakeRaw(int(os.Stdin.Fd())) + if err != nil { + panic(err) + } + defer func() { _ = term.Restore(int(os.Stdin.Fd()), oldState) }() // Best effort. + + // Copy stdin to the pty and the pty to stdout. + // NOTE: The goroutine will keep reading until the next keystroke before returning. + go func() { _, _ = io.Copy(ptmx, os.Stdin) }() + _, _ = io.Copy(os.Stdout, ptmx) + + return nil +} + +func mainBash() { + if err := test(); err != nil { + exit(err) + } +} diff --git a/hostname.go b/hostname.go index 98c9f49..9f5a66f 100644 --- a/hostname.go +++ b/hostname.go @@ -18,13 +18,19 @@ import "git.wit.org/jcarr/dnssecsocket" func getHostname() { var err error - me.fqdn, err = fqdn.FqdnHostname() + var s string = "gui.Label == nil" + s, err = fqdn.FqdnHostname() if (err != nil) { log("FQDN hostname error =", err) exit() return } - log("FQDN hostname is", me.fqdn) + if (me.fqdn != nil) { + // s = me.fqdn.GetText() + output("trying to update gui.Label", true) + me.fqdn.SetText(s) + } + output("FQDN = jcarr" + s + "\n", true) } func dnsAAAA(s string) []string {