From 54bfb171b9f992603770278cde9cbefd0ff2bd4e Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 3 Nov 2021 16:22:40 -0500 Subject: [PATCH] APT: start a seperate file for all things apt Signed-off-by: Jeff Carr --- Makefile | 6 ++++++ apt.go | 25 +++++++++++++++++++++++++ window-resets.go | 34 +++++++++++++++++++--------------- 3 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 apt.go diff --git a/Makefile b/Makefile index 226861f..beccf3a 100644 --- a/Makefile +++ b/Makefile @@ -89,3 +89,9 @@ gaper: # 'gaper' is a simple and smart golang tool that just rebuilds every time you change a file # go get -u github.com/maxcnunes/gaper gaper + +node002: new-build + strip ~/go/bin/wit-debian-gui + -ssh root@node002 rm /root/wit-debian-gui + scp ~/go/bin/wit-debian-gui root@node002: + ssh -X root@node002 /root/wit-debian-gui diff --git a/apt.go b/apt.go new file mode 100644 index 0000000..af8c7fb --- /dev/null +++ b/apt.go @@ -0,0 +1,25 @@ +package main + +import ( +// "log" + + "git.wit.org/wit/gui" +) + +func AddAptGroup(tab *gui.Node) { + n := tab.AddGroup("apt Resets") + + n.AddButton("apt sources", func (*gui.Node) { + xterm("apt -y install apt-file; apt-file update") + }) + n.AddButton("purge rc-only", func (*gui.Node) { + xterm("dpkg -l |grep ^rc | awk '{print $2}' |xargs apt remove --purge -y") + }) + n.AddButton("install defaults", func (*gui.Node) { + xterm("./resources/bin/setup-packages-default") + }) + n.AddButton("install kvm", func (*gui.Node) { + xterm("./resources/bin/setup-packages-kvm") + }) + +} diff --git a/window-resets.go b/window-resets.go index 2b1a702..312762c 100644 --- a/window-resets.go +++ b/window-resets.go @@ -44,21 +44,7 @@ func tabResets(w *gui.Node) *gui.Node { } }) - ///////////////////////////////////////////////////////////////////////////// - resetsNode := newTab.AddGroup("apt Resets") - - resetsNode.AddButton("apt sources", func (*gui.Node) { - xterm("apt -y install apt-file; apt-file update") - }) - resetsNode.AddButton("purge rc-only", func (*gui.Node) { - xterm("dpkg -l |grep ^rc | awk '{print $2}' |xargs apt remove --purge -y") - }) - resetsNode.AddButton("install defaults", func (*gui.Node) { - xterm("./resources/bin/setup-packages-default") - }) - resetsNode.AddButton("install kvm", func (*gui.Node) { - xterm("./resources/bin/setup-packages-kvm") - }) + AddAptTab(newTab) ///////////////////////////////////////////////////////////////////////////// gn := newTab.AddGroup("GO") @@ -75,3 +61,21 @@ func tabResets(w *gui.Node) *gui.Node { return newTab } + +func AddAptTab(tab *gui.Node) { + n := tab.AddGroup("apt Resets") + + n.AddButton("apt sources", func (*gui.Node) { + xterm("apt -y install apt-file; apt-file update") + }) + n.AddButton("purge rc-only", func (*gui.Node) { + xterm("dpkg -l |grep ^rc | awk '{print $2}' |xargs apt remove --purge -y") + }) + n.AddButton("install defaults", func (*gui.Node) { + xterm("./resources/bin/setup-packages-default") + }) + n.AddButton("install kvm", func (*gui.Node) { + xterm("./resources/bin/setup-packages-kvm") + }) + +}