From c93300a4b894e11aa2a0b133dfa0b623edf484d1 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Thu, 2 Oct 2025 18:17:21 -0500 Subject: don't init forge on upgrade --- Makefile | 13 ++++++++++++- main.go | 6 ++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 94f34bc..d1ff705 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ VERSION = $(shell git describe --tags) GUIVERSION = $(shell git describe --tags) -BUILDTIME = $(shell date +%Y.%m.%d) +# BUILDTIME = $(shell date +%Y.%m.%d) +BUILDTIME = $(shell date +%s) all: install @@ -65,3 +66,13 @@ debian-release-force: install debian-release-build-only: install wit-test debian --verbose --release + +# build packages no matter what +debian-force: + rm -f ~/incoming/*.deb + rm -f ~/incoming-devel/*.deb + wit-test debian --force --verbose + -mv ~/incoming-devel/*.deb ~/incoming/ + rm -f ~/incoming/go-gui*deb + do-aptly + rm -f ~/go/bin/forged # causes bash completion annoyances diff --git a/main.go b/main.go index 3ce450c..445ca89 100644 --- a/main.go +++ b/main.go @@ -38,6 +38,12 @@ func main() { state = make(map[*gitpb.Repo]string) debnames = make(map[*gitpb.Repo]string) + if argv.Upgrade != nil { + me.machine, _ = zoopb.InitMachine() + doAptUpgrade() + okExit("") + } + me.forge = forgepb.Init() me.forge.Config.DumpENV() -- cgit v1.2.3