From 9242d7a35fc12a978a4cb2a1410f776e02fe5653 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 6 Nov 2024 16:44:48 -0600 Subject: [PATCH] cleanup packaging Signed-off-by: Jeff Carr --- Makefile | 3 ++- build | 2 +- indexHtml.go | 4 ---- resources/repomap | 54 +---------------------------------------------- 4 files changed, 4 insertions(+), 59 deletions(-) diff --git a/Makefile b/Makefile index c8ea397..86fd2a0 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,8 @@ clean: # makes a .deb package debian: - go-deb --no-gui --repo go.wit.com/apps/gowebd + rm ~/incoming/gowebd*.deb + go-deb --no-gui --keep-files --repo go.wit.com/apps/gowebd squash-the-last-3-commits-together: git rebase -i HEAD~3 diff --git a/build b/build index f0a2833..2240868 100755 --- a/build +++ b/build @@ -12,5 +12,5 @@ cp resources/Makefile files/etc/gowebd/ # share dir mkdir -p files/usr/share/gowebd/ cp Makefile files/usr/share/gowebd/ -cp -a resources/repomap files/usr/share/gowebd/go.wit.com +cp -a resources/repomap files/usr/share/gowebd/repomap cp -a resources files/usr/share/gowebd/ diff --git a/indexHtml.go b/indexHtml.go index 08c2014..7f56e18 100644 --- a/indexHtml.go +++ b/indexHtml.go @@ -32,10 +32,6 @@ func indexHeader(w http.ResponseWriter) { func indexBodyStart(w http.ResponseWriter) { // fmt.Fprintln(w, " fmt.Fprintln(w, "") - fmt.Fprintln(w, "
") - fmt.Fprintln(w, "There are debian packages for most of these on mirrors.wit.com
") - fmt.Fprintln(w, "
") - fmt.Fprintln(w, "
") fmt.Fprintln(w, "
") fmt.Fprintln(w, "
") fmt.Fprintln(w, " ") diff --git a/resources/repomap b/resources/repomap index 683d705..938f13f 100644 --- a/resources/repomap +++ b/resources/repomap @@ -1,4 +1,4 @@ -# gui core packages +# sample gowebd package mappings go.wit.com/gui git.wit.org/gui/gui The GUI API intended for Control Panels go.wit.com/widget git.wit.org/gui/widget Primitive Definitions for Buttons, Dropdowns, etc. @@ -8,55 +8,3 @@ go.wit.com/widget git.wit.org/gui/widget Primitive Definitions for Buttons, Drop go.wit.com/apps/helloworld git.wit.org/gui/helloworld A simple Demo go.wit.com/apps/basicwindow git.wit.org/jcarr/basicwindow A bit more of a Demo go.wit.com/apps/gadgetwindow git.wit.org/jcarr/gadgetwindow A more complicated Demo used for debugging the toolkits - -# Applications - -go.wit.com/apps/autotypist git.wit.org/jcarr/autotypist Wrapper around 'git' and 'go' for these repos -go.wit.com/apps/guireleaser git.wit.org/jcarr/guireleaser -go.wit.com/apps/forge git.wit.org/jcarr/submit-patchset -go.wit.com/apps/go-deb git.wit.org/jcarr/go-deb Turn a GO package into a .deb package -go.wit.com/apps/control-panel-droplet git.wit.org/wit/control-panel-droplet A VM (droplet) Control Panel -go.wit.com/apps/control-panel-dns git.wit.org/jcarr/control-panel-dns A DNS Control Panel -go.wit.com/apps/control-panel-cloudflare git.wit.org/wit/control-panel-cloudflare -go.wit.com/apps/control-panel-vpn git.wit.org/jcarr/control-panel-vpn -go.wit.com/apps/go-gui-toolkits git.wit.org/gui/go-gui-toolkits toolkit build helper -go.wit.com/apps/go.wit.com git.wit.org/jcarr/go.wit.com -go.wit.com/apps/powerpaneld git.wit.org/jcarr/powerpaneld -go.wit.com/apps/go-clone git.wit.org/gui/go-clone - -# gui toolkit packages -go.wit.com/toolkits/tree git.wit.org/toolkits/tree common toolkit plugin code -go.wit.com/toolkits/andlabs git.wit.org/toolkits/andlabs Platform Native GUI (GTK on Linux and Cocoa on MacOS, Windows needs golang plugins) -go.wit.com/toolkits/gocui git.wit.org/toolkits/gocui A console based GUI (like ncurses) -go.wit.com/toolkits/nocui git.wit.org/toolkits/nocui A minimum toolkit plugin using STDIN/STDOUT -go.wit.com/toolkits/pixelgl git.wit.org/jcarr/pixelgl an experiment with opengl (no widgets yet) -go.wit.com/toolkits/fyne git.wit.org/jcarr/fyne fyne.io (early stages. only makes windows and buttons) -go.wit.com/toolkits/debian git.wit.org/toolkits/debian make a .deb of the toolkit plugin binaries - -# log/ (modified for the gui) - -go.wit.com/log git.wit.org/wit/log a wrapper attempt around log for the GUI - -# gui libraries -go.wit.com/lib/gadgets git.wit.org/gui/gadgets Some common collections of widgets -go.wit.com/lib/debugger git.wit.org/gui/debugger An attempt at a debugger -go.wit.com/lib/gui/repostatus git.wit.org/jcarr/repostatus used by autotypist -go.wit.com/lib/gui/repolist git.wit.org/jcarr/repolist used by autotypist -go.wit.com/lib/gui/hostname git.wit.org/jcarr/hostname -go.wit.com/lib/gui/linuxstatus git.wit.org/jcarr/hostname for the DNS Control Panel -go.wit.com/lib/gui/logsettings git.wit.org/jcarr/logsettings used for 'log' and debugger -go.wit.com/lib/gui/digitalocean git.wit.org/gui/digitalocean used by the DO control panel -go.wit.com/lib/gui/cloudflare git.wit.org/gui/cloudflare -go.wit.com/lib/gui/gowit git.wit.org/jcarr/gowit -go.wit.com/lib/gui/shell git.wit.org/wit/shell -go.wit.com/lib/protobuf/wit git.wit.org/wit/witProtobuf - -# Support packages (forked for experiments) - -go.wit.com/dev/alexflint/arg git.wit.org/jcarr/go-arg slight modifications to arg -go.wit.com/dev/alexflint/scalar git.wit.org/jcarr/go-scalar -go.wit.com/dev/andlabs/ui git.wit.org/interesting/andlabs-ui attempts to add RiscV support -go.wit.com/dev/andlabs/libui git.wit.org/interesting/libui -go.wit.com/dev/davecgh/spew git.wit.org/jcarr/go-spew - -go.wit.com/dev/test/gogit2 git.wit.org/jcarr/gogit2