summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2024-03-02 17:17:53 -0600
committerJeff Carr <[email protected]>2024-03-02 17:17:53 -0600
commit1279baed72e38f47eef38448ee63e03605659409 (patch)
tree862e3759cb966f6596564accf0f9a5cdd170141a
parent6fd65592037cfd4d4843249d201863e9ff1df61a (diff)
debian packages must start with a number
-rw-r--r--Makefile13
-rw-r--r--buildPackage.go9
2 files changed, 5 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index 5d2e725..b0e340d 100644
--- a/Makefile
+++ b/Makefile
@@ -11,13 +11,9 @@ no-gui: build
./go-deb --no-gui --repo go.wit.com/apps/autotypist
build:
- -mkdir resources
- -cp ~/go/src/go.wit.com/toolkits/*.so resources/
GO111MODULE="off" go build -v
install:
- -mkdir resources
- -cp ~/go/src/go.wit.com/toolkits/*.so resources/
GO111MODULE="off" go install -v
goimports:
@@ -41,15 +37,6 @@ nocui: reset build
clean:
-rm go-deb
- -rm -rf files/
- -rm -f resources/*.so
- -rm *.deb
-
-debian:
- cd debian && make
-
-mirrors:
- -wit mirrors
build-go-gui-toolkits: build
./go-deb --release --no-gui --repo go.wit.com/apps/go-gui-toolkits
diff --git a/buildPackage.go b/buildPackage.go
index b45f0d6..3a4310c 100644
--- a/buildPackage.go
+++ b/buildPackage.go
@@ -11,6 +11,7 @@ import (
"strings"
"time"
+ "go.wit.com/lib/gui/repolist"
"go.wit.com/lib/gui/shell"
"go.wit.com/log"
)
@@ -38,10 +39,10 @@ func (c *controlBox) buildPackage() (bool, error) {
}
arch := c.Architecture.String()
- version := c.Version.String()
- if version == "" {
- version = "0.0.0"
- }
+ tmp := c.Version.String()
+ version := repolist.ValidDebianPackageVersion(tmp)
+ log.Info("version went from", tmp, "to", version)
+ os.Exit(-1)
debname := filename + "_" + version + "_" + arch + ".deb"
fulldebname := filepath.Join(homeDir, "incoming", debname)
if shell.Exists(fulldebname) {