Merge pull request #7 from dewep-online/develope

build sub versions

Author: markus621

Makefile

@@ -20,5 +20,8 @@ tests:
 ci:
 	bash scripts/ci.sh
 
+deb: build
+	deb-builder build
+
 install: build
 	@GO111MODULE=on GOOS=linux GOARCH=amd64 go build -o $(GOPATH)/bin/deb-builder ./cmd/deb-builder/

go.mod

@@ -4,7 +4,7 @@ go 1.16
 
 require (
 	github.com/deweppro/go-app v1.4.2
-	github.com/deweppro/go-archives v1.0.2
+	github.com/deweppro/go-archives v1.0.3
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97

go.sum

@@ -5,8 +5,8 @@ github.com/deweppro/go-algorithms v1.1.1 h1:FOzPuYmFuFGN6Nmcos5zC1WfD3Ya8XxUJ6Oi
 github.com/deweppro/go-algorithms v1.1.1/go.mod h1:h50x8PTIGbiIhOh5vH/10J39vTzi2UmG7TVLupellqY=
 github.com/deweppro/go-app v1.4.2 h1:mpYjwyC2b6089CdRhJuJPMeiETu4ldaCXE9fSMQwarQ=
 github.com/deweppro/go-app v1.4.2/go.mod h1:Tm4RUCOw7R/qnomzYT/rIykfqRI1zNfDArpHsaLgl/I=
-github.com/deweppro/go-archives v1.0.2 h1:0kHfvhr3tD9r8QqVDSZttFPq0chaAwaXnK0atXeD5SY=
-github.com/deweppro/go-archives v1.0.2/go.mod h1:GP2Or5TFSEWQAam/Q/jgFhLpcF0LroITKic654pQERk=
+github.com/deweppro/go-archives v1.0.3 h1:Vmv8/myS6Cv8buEmmmN3/EWzfDRdx24h8svMbQCsS2c=
+github.com/deweppro/go-archives v1.0.3/go.mod h1:GP2Or5TFSEWQAam/Q/jgFhLpcF0LroITKic654pQERk=
 github.com/deweppro/go-chan-pool v1.1.1 h1:TCoQhgXG6GP7zTJiKwOmqSeaR64651cWFpVniD5BIys=
 github.com/deweppro/go-chan-pool v1.1.1/go.mod h1:lEtDI+rhCE/ES1i9q0FOtYgjMftw5PCCepit4a+9Uds=
 github.com/deweppro/go-logger v1.2.3 h1:icOV4UwBGc8s9S8zcNIcDjBK00qQtcuBZzBgRmMaq24=

internal/commands/build.go

@@ -22,9 +22,8 @@ func Build() console.CommandGetter {
 		setter.Flag(func(fs console.FlagsSetter) {
 			fs.StringVar("base-dir", utils.GetEnv("DEB_STORAGE_BASE_DIR", "/tmp/deb-storage"), "Deb package base storage")
 			fs.StringVar("tmp-dir", utils.GetEnv("DEB_BUILD_DIR", "/tmp/deb-build"), "Deb package build dir")
-			fs.StringVar("subver", "", "Set date for calc subversion time. Format: 2022-01-01")
 		})
-		setter.ExecFunc(func(_ []string, baseDir, tmpDir string, subver string) {
+		setter.ExecFunc(func(_ []string, baseDir, tmpDir string) {
 			conf, err := config.Detect()
 			console.FatalIfErr(err, "deb config not found")
 
@@ -35,15 +34,27 @@ func Build() console.CommandGetter {
 			storeDir := fmt.Sprintf("%s/%s/%s", baseDir, conf.Package[0:1], conf.Package)
 			console.FatalIfErr(os.MkdirAll(storeDir, 0755), "creating storage directory")
 
-			subVersion := ""
-			if len(subver) > 0 {
-				pt, err := time.Parse("2006-01-02", subver)
-				console.FatalIfErr(err, "parse date for calc subversion")
-				subVersion = fmt.Sprintf("-%d", time.Now().Unix()-pt.Unix())
-			}
-
 			exec.Build(conf, func(arch string) {
 
+				// check file version
+
+				subVersion := ""
+				debFileNameBuild := func() string {
+					return fmt.Sprintf("%s/%s_%s%s_%s.deb", storeDir, conf.Package, conf.Version, subVersion, arch)
+				}
+				debFile := debFileNameBuild()
+				for {
+					utils.FileStat(debFile, func(fi os.FileInfo) {
+						subVersion = fmt.Sprintf("-%d", time.Now().Unix()-fi.ModTime().Unix())
+						debFile = debFileNameBuild()
+					})
+
+					if !utils.FileExist(debFile) {
+						break
+					}
+					<-time.After(time.Second)
+				}
+
 				// package
 
 				cpkg := control.NewControlPkg(conf)
@@ -95,8 +106,6 @@ func Build() console.CommandGetter {
 
 				// build deb
 
-				debFile := fmt.Sprintf("%s/%s_%s%s_%s.deb", storeDir, conf.Package, conf.Version, subVersion, arch)
-				console.FatalIfErr(os.RemoveAll(debFile), "remove old deb file")
 				deb, err := ar.Open(debFile, 0644)
 				console.FatalIfErr(err, "create %s", debFile)
 				console.FatalIfErr(deb.Write("debian-binary", []byte("2.0\n"), 0644), "write debian-binary to %s", debFile)

pkg/utils/common.go

@@ -37,6 +37,12 @@ func FileExist(filename string) bool {
 	return err == nil
 }
 
+func FileStat(filename string, callFunc func(fi os.FileInfo)) {
+	if info, err := os.Stat(filename); err == nil {
+		callFunc(info)
+	}
+}
+
 func CopyFile(dst, src string) error {
 	source, err := os.OpenFile(src, os.O_RDONLY, 0)
 	if err != nil {

scripts/postinst.sh

@@ -0,0 +1 @@
+#!/bin/bash

scripts/postrm.sh

@@ -0,0 +1 @@
+#!/bin/bash

scripts/preinst.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+

scripts/prerm.sh

@@ -0,0 +1 @@
+#!/bin/bash