From d259bd2ccd43c8dd09ae1a6050d5cb59337ec7dd Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sat, 22 Apr 2023 15:19:28 -0500 Subject: [PATCH] apt sources Signed-off-by: Jeff Carr --- Makefile | 1 + resources/apt/sources.list | 13 ++++------- resources/{ => apt}/sources.list.d/bazel.list | 0 .../{ => apt}/sources.list.d/debian.list | 0 .../{ => apt}/sources.list.d/gcloud.list | 0 .../sources.list.d/google-chrome.list | 0 .../{ => apt}/sources.list.d/picoscope.list | 0 .../{ => apt}/sources.list.d/signal.list | 0 resources/{ => apt}/sources.list.d/wit.list | 0 window-main.go | 23 ++++++++++++++++--- 10 files changed, 26 insertions(+), 11 deletions(-) rename resources/{ => apt}/sources.list.d/bazel.list (100%) rename resources/{ => apt}/sources.list.d/debian.list (100%) rename resources/{ => apt}/sources.list.d/gcloud.list (100%) rename resources/{ => apt}/sources.list.d/google-chrome.list (100%) rename resources/{ => apt}/sources.list.d/picoscope.list (100%) rename resources/{ => apt}/sources.list.d/signal.list (100%) rename resources/{ => apt}/sources.list.d/wit.list (100%) diff --git a/Makefile b/Makefile index 01e9677..00f0baf 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ VERSION = $(shell cat resources/VERSION) # PATH=/usr/bin:$PATH go version build: + git pull # reset GO111MODULE="off" go build -v ./wit-new-machine diff --git a/resources/apt/sources.list b/resources/apt/sources.list index 76f8ac0..9df3add 100644 --- a/resources/apt/sources.list +++ b/resources/apt/sources.list @@ -1,20 +1,17 @@ -deb http://mirrors.wit.org/debian/ sid main contrib non-free -deb-src http://mirrors.wit.org/debian/ sid main contrib non-free +# deb http://mirrors.wit.org/debian/ sid main contrib non-free +# deb-src http://mirrors.wit.org/debian/ sid main contrib non-free # deb http://deb.debian.org/debian experimental main # apt -t experimental install xrandr -<<<<<<< HEAD # INFO: http://deb.debian.org/ # NO_PUBKEY 5A88D659DCB811BB # deprecated: apt-key adv --keyserver keyring.debian.org --recv-keys 5A88D659DCB811BB # use: apt install debian-ports-archive-keyring -deb http://deb.debian.org/debian unstable main contrib non-free -deb http://deb.debian.org/debian-debug unstable-debug main contrib non-free -deb http://deb.debian.org/debian-ports unstable main contrib non-free +# deb http://deb.debian.org/debian unstable main contrib non-free +# deb http://deb.debian.org/debian-debug unstable-debug main contrib non-free +# deb http://deb.debian.org/debian-ports unstable main contrib non-free -======= ->>>>>>> 90a3833 (APT: add files for apt) ###################### apt fallback to cogentco.com ########################### #deb http://mirror.cogentco.com/debian/ sid main contrib non-free #deb-src http://mirror.cogentco.com/debian/ sid main contrib non-free diff --git a/resources/sources.list.d/bazel.list b/resources/apt/sources.list.d/bazel.list similarity index 100% rename from resources/sources.list.d/bazel.list rename to resources/apt/sources.list.d/bazel.list diff --git a/resources/sources.list.d/debian.list b/resources/apt/sources.list.d/debian.list similarity index 100% rename from resources/sources.list.d/debian.list rename to resources/apt/sources.list.d/debian.list diff --git a/resources/sources.list.d/gcloud.list b/resources/apt/sources.list.d/gcloud.list similarity index 100% rename from resources/sources.list.d/gcloud.list rename to resources/apt/sources.list.d/gcloud.list diff --git a/resources/sources.list.d/google-chrome.list b/resources/apt/sources.list.d/google-chrome.list similarity index 100% rename from resources/sources.list.d/google-chrome.list rename to resources/apt/sources.list.d/google-chrome.list diff --git a/resources/sources.list.d/picoscope.list b/resources/apt/sources.list.d/picoscope.list similarity index 100% rename from resources/sources.list.d/picoscope.list rename to resources/apt/sources.list.d/picoscope.list diff --git a/resources/sources.list.d/signal.list b/resources/apt/sources.list.d/signal.list similarity index 100% rename from resources/sources.list.d/signal.list rename to resources/apt/sources.list.d/signal.list diff --git a/resources/sources.list.d/wit.list b/resources/apt/sources.list.d/wit.list similarity index 100% rename from resources/sources.list.d/wit.list rename to resources/apt/sources.list.d/wit.list diff --git a/window-main.go b/window-main.go index 5ee2d61..efda4f0 100644 --- a/window-main.go +++ b/window-main.go @@ -35,6 +35,11 @@ var padding *gui.Node var firefox *gui.Node var resolv *gui.Node +func writeRes(indir string, outdir string, name string) { + tmp, _ := res.ReadFile(indir + name) + ioutil.WriteFile(outdir + name, tmp, 0644) +} + func mainTab(n *gui.Node) { var g *gui.Node @@ -56,7 +61,18 @@ func mainTab(n *gui.Node) { rn := newTab.NewGroup("Local Linux Settings") rn.NewButton("apt sources", func () { - xterm("cd ~/jcarr/setup; make setup-apt-sources; make setup-apt-file") + if _, err := os.Stat("/etc/apt/sources.list.d/wit.list"); err == nil { + log.Println("apt sources are already configured") + } else { + myGui.CloseToolkit("gocui") + writeRes("resources/", "/etc/", "apt/sources.list") + writeRes("resources/", "/etc/", "apt/sources.list.d/wit.list") + writeRes("resources/", "/etc/", "apt/sources.list.d/debian.list") + doCmd("apt update") + doCmd("apt dist-upgrade") + log.Println("\nYou should reboot now\n") + os.Exit(0) + } }) rn.NewButton("apt update", func () { myGui.CloseToolkit("gocui") @@ -96,8 +112,9 @@ func mainTab(n *gui.Node) { if _, err := os.Stat("/etc/default/grub.d/wit.cfg"); err == nil { log.Println("Grub is already configured") } else { - grub, _ := res.ReadFile("resources/grub.d/wit.cfg") - ioutil.WriteFile("/etc/default/grub.d/wit.cfg", grub, 0644) + writeRes("resources/", "/etc/default/", "grub.d/wit.cfg") + // grub, _ := res.ReadFile("resources/grub.d/wit.cfg") + // ioutil.WriteFile("/etc/default/grub.d/wit.cfg", grub, 0644) doCmd("update-grub") } os.Exit(0)