jcarr
/
go-deb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

common version

This commit is contained in:
Jeff Carr 2024-03-02 17:51:34 -06:00
parent 1279baed72
commit 16f4ec5ac0
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addRepo.go
View File

@ -67,19 +67,17 @@ func (c *controlBox) addRepo(path string) {
cbname := c.status.GetCurrentBranchName() cbname := c.status.GetCurrentBranchName()
cbversion := c.status.GetCurrentBranchVersion() cbversion := c.status.GetCurrentBranchVersion()
debversion := strings.TrimPrefix(cbversion, "v") debversion := c.status.DebianCurrentVersion()
if c.status.CheckDirty() { if c.status.CheckDirty() {
c.dirtyL.SetText("true") c.dirtyL.SetText("true")
debversion = debversion + "-dirty"
} else { } else {
c.dirtyL.SetText("false") c.dirtyL.SetText("false")
} }
lasttag := c.status.GetLastTagVersion() lasttag := c.status.GetLastTagVersion()
if args.Release { if args.Release {
debversion = lasttag debversion = c.status.DebianReleaseVersion()
debversion = strings.TrimPrefix(debversion, "v")
c.dirtyL.SetText("false") c.dirtyL.SetText("false")
} }

7
buildPackage.go
View File

@ -11,7 +11,6 @@ import (
"strings" "strings"
"time" "time"
"go.wit.com/lib/gui/repolist"
"go.wit.com/lib/gui/shell" "go.wit.com/lib/gui/shell"
"go.wit.com/log" "go.wit.com/log"
) )
@ -39,10 +38,8 @@ func (c *controlBox) buildPackage() (bool, error) {
} }
arch := c.Architecture.String() arch := c.Architecture.String()
tmp := c.Version.String() version := c.Version.String()
version := repolist.ValidDebianPackageVersion(tmp) log.Info("version is:", version)
log.Info("version went from", tmp, "to", version)
os.Exit(-1)
debname := filename + "_" + version + "_" + arch + ".deb" debname := filename + "_" + version + "_" + arch + ".deb"
fulldebname := filepath.Join(homeDir, "incoming", debname) fulldebname := filepath.Join(homeDir, "incoming", debname)
if shell.Exists(fulldebname) { if shell.Exists(fulldebname) {