Skip to content

Commit

Permalink
upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
markus621 committed Sep 23, 2023
1 parent d980dca commit 42e55ce
Show file tree
Hide file tree
Showing 35 changed files with 278 additions and 189 deletions.
6 changes: 3 additions & 3 deletions .deb.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package: deb-builder
source: deb-builder
version: '1:0.4.1'
version: '1:0.5.0'
architecture:
- amd64
- arm64
maintainer: DewepOnline <deb@dewep.online>
homepage: https://dewep.online/deb-builder
maintainer: The OSSPkg Team <github@osspkg.com>
homepage: https://deb.osspkg.com/
description:
- Debian package builder
section: web
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@

name: "CodeQL"

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
schedule:
- cron: '16 8 * * 1'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'go' ]

steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,5 @@
.idea
.vscode
.tools
vendorgo test -c`
*.test
*.out
vendor/
build/
3 changes: 3 additions & 0 deletions .lic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
author: Mikhail Knyazhev <markus621@gmail.com>
lic_short: BSD-3-Clause
lic_file: LICENSE
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

.PHONY: install
install:
go install github.com/dewep-online/devtool@latest
go install github.com/osspkg/devtool@latest

.PHONY: setup
setup:
Expand All @@ -11,6 +11,10 @@ setup:
lint:
devtool lint

.PHONY: license
license:
devtool license

.PHONY: build
build:
devtool build --arch=amd64
Expand Down
30 changes: 16 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

# deb-builder

[![Coverage Status](https://coveralls.io/repos/github/dewep-online/deb-builder/badge.svg?branch=master)](https://coveralls.io/github/dewep-online/deb-builder?branch=master)
[![Release](https://img.shields.io/github/release/dewep-online/deb-builder.svg?style=flat-square)](https://github.com/dewep-online/deb-builder/releases/latest)
[![Go Report Card](https://goreportcard.com/badge/github.com/dewep-online/deb-builder)](https://goreportcard.com/report/github.com/dewep-online/deb-builder)
[![CI](https://github.com/dewep-online/deb-builder/actions/workflows/ci.yml/badge.svg)](https://github.com/dewep-online/deb-builder/actions/workflows/ci.yml)
[![Coverage Status](https://coveralls.io/repos/github/osspkg/deb-builder/badge.svg?branch=master)](https://coveralls.io/github/osspkg/deb-builder?branch=master)
[![Release](https://img.shields.io/github/release/osspkg/deb-builder.svg?style=flat-square)](https://github.com/osspkg/deb-builder/releases/latest)
[![Go Report Card](https://goreportcard.com/badge/github.com/osspkg/deb-builder)](https://goreportcard.com/report/github.com/osspkg/deb-builder)
[![CI](https://github.com/osspkg/deb-builder/actions/workflows/ci.yml/badge.svg)](https://github.com/osspkg/deb-builder/actions/workflows/ci.yml)

# install

```go
go install github.com/dewep-online/deb-builder/cmd/deb-builder@latest
go install github.com/osspkg/deb-builder/cmd/deb-builder@latest
```

# create config file `.deb.yaml`
Expand Down Expand Up @@ -63,27 +63,29 @@ deb-builder build --base-dir=/path_to_deb_release_directory/pool/main --tmp-dir=
# build release repos

```bash
deb-builder build --release-dir=/path_to_deb_release_directory --private-key=/path_to_pgp_key/private.pgp --origin='Company Name' --label='Company Info'
deb-builder release --release-dir=/path_to_deb_release_directory --private-key=/path_to_pgp_key/private.pgp --origin='Company Name' --label='Company Info'
```

Add to apt [amd64]

```bash
$ wget -qO - https://yourdomain/key.gpg | sudo apt-key add -
$ sudo tee /etc/apt/sources.list.d/yourdomain.list <<'EOF'
deb [arch=amd64] https://yourdomain/ stable main
curl -fsSL https://[yourdomain]/key.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/[yourdomain].gpg
sudo chmod a+r /etc/apt/keyrings/[yourdomain].gpg
sudo tee /etc/apt/sources.list.d/[yourdomain].list <<'EOF'
deb [arch=amd64 signed-by=/etc/apt/keyrings/[yourdomain].gpg] https://[yourdomain]/ stable main
EOF
$ sudo apt-get update
sudo apt update
```

Add to apt [arm64]

```bash
$ wget -qO - https://yourdomain/key.gpg | sudo apt-key add -
$ sudo tee /etc/apt/sources.list.d/yourdomain.list <<'EOF'
deb [arch=arm64] https://yourdomain/ stable main
curl -fsSL https://[yourdomain]/key.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/[yourdomain].gpg
sudo chmod a+r /etc/apt/keyrings/[yourdomain].gpg
sudo tee /etc/apt/sources.list.d/[yourdomain].list <<'EOF'
deb [arch=arm64 signed-by=/etc/apt/keyrings/[yourdomain].gpg] https://[yourdomain]/ stable main
EOF
$ sudo apt-get update
sudo apt update
```

# build pgp key
Expand Down
10 changes: 7 additions & 3 deletions cmd/deb-builder/main.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
/*
* Copyright (c) 2021-2023 Mikhail Knyazhev <markus621@gmail.com>. All rights reserved.
* Use of this source code is governed by a BSD-3-Clause license that can be found in the LICENSE file.
*/

package main

import (
"github.com/dewep-online/deb-builder/internal/commands"

"github.com/deweppro/go-sdk/console"
"github.com/osspkg/deb-builder/internal/commands"
"github.com/osspkg/go-sdk/console"
)

func main() {
Expand Down
14 changes: 5 additions & 9 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
module github.com/dewep-online/deb-builder
module github.com/osspkg/deb-builder

go 1.17

require (
github.com/deweppro/go-archives v1.0.4
github.com/deweppro/go-errors v0.0.4
github.com/deweppro/go-sdk v1.1.6
github.com/stretchr/testify v1.8.2
golang.org/x/crypto v0.7.0
github.com/osspkg/go-archives v1.0.5
github.com/osspkg/go-sdk v1.3.6
github.com/stretchr/testify v1.8.4
golang.org/x/crypto v0.11.0
gopkg.in/yaml.v3 v3.0.1
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deweppro/go-algorithms v1.2.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
)
84 changes: 8 additions & 76 deletions go.sum
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,84 +1,16 @@
cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/deweppro/go-algorithms v1.2.1 h1:5/IEqw7WOaGsaaBSP1hIq16has91MV6Te0SNwCwSK+E=
github.com/deweppro/go-algorithms v1.2.1/go.mod h1:VW0wmlJiXEw+TVEAtWDr+P7Zg9IocCmkS8VSIDoDHlc=
github.com/deweppro/go-archives v1.0.4 h1:CB5nX5ll7PyDU5s5yFmBq9Dn5xZGjSRumawZRZgMfkk=
github.com/deweppro/go-archives v1.0.4/go.mod h1:3OVhSu087B6aIsFGBzEMCE6iZzBC39bI/MB4qAOlQVI=
github.com/deweppro/go-errors v0.0.4 h1:TW91LRqHAkUauDJ5lzz73LziANH7mjli1tyvtwzXRCM=
github.com/deweppro/go-errors v0.0.4/go.mod h1:BLsNcxaHh1fjNl/o1TB69JwA8XueSk/Nszkvw4ZwI/I=
github.com/deweppro/go-sdk v1.1.6 h1:yjCsPMc02fGw2nZ/0grorPovTu1J6Njrz8L821QuSiA=
github.com/deweppro/go-sdk v1.1.6/go.mod h1:orW509URVLItj8Xah+PwcEyjwVi7L3lTbVfEeg1T8/c=
github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
github.com/osspkg/go-archives v1.0.5 h1:B4t4iAPCXO1JCvWR208sBDzB7VKPjc/XFSZufG5LRn0=
github.com/osspkg/go-archives v1.0.5/go.mod h1:335ZyS17G0QBj3SEvqPAMxllWdOy3WSfhHmM2AomSBA=
github.com/osspkg/go-sdk v1.3.6 h1:VcB5o3+c1uwkD2B0v4ZxOeaN/SN0QUr3Fktt8S3Le0M=
github.com/osspkg/go-sdk v1.3.6/go.mod h1:/ZzPlvttlMyTLiDomDGJt7sqFz/RmkWXzrK5tifci14=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A=
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
21 changes: 13 additions & 8 deletions internal/commands/build.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright (c) 2021-2023 Mikhail Knyazhev <markus621@gmail.com>. All rights reserved.
* Use of this source code is governed by a BSD-3-Clause license that can be found in the LICENSE file.
*/

package commands

import (
Expand All @@ -7,14 +12,14 @@ import (
"path/filepath"
"strings"

"github.com/dewep-online/deb-builder/pkg/archive"
"github.com/dewep-online/deb-builder/pkg/config"
"github.com/dewep-online/deb-builder/pkg/control"
"github.com/dewep-online/deb-builder/pkg/exec"
"github.com/dewep-online/deb-builder/pkg/packages"
"github.com/dewep-online/deb-builder/pkg/utils"
"github.com/deweppro/go-archives/ar"
"github.com/deweppro/go-sdk/console"
"github.com/osspkg/deb-builder/pkg/archive"
"github.com/osspkg/deb-builder/pkg/config"
"github.com/osspkg/deb-builder/pkg/control"
"github.com/osspkg/deb-builder/pkg/exec"
"github.com/osspkg/deb-builder/pkg/packages"
"github.com/osspkg/deb-builder/pkg/utils"
"github.com/osspkg/go-archives/ar"
"github.com/osspkg/go-sdk/console"
)

func Build() console.CommandGetter {
Expand Down
9 changes: 7 additions & 2 deletions internal/commands/config.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
/*
* Copyright (c) 2021-2023 Mikhail Knyazhev <markus621@gmail.com>. All rights reserved.
* Use of this source code is governed by a BSD-3-Clause license that can be found in the LICENSE file.
*/

package commands

import (
"github.com/dewep-online/deb-builder/pkg/config"
"github.com/deweppro/go-sdk/console"
"github.com/osspkg/deb-builder/pkg/config"
"github.com/osspkg/go-sdk/console"
)

func CreateConfig() console.CommandGetter {
Expand Down
9 changes: 7 additions & 2 deletions internal/commands/pgp.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
/*
* Copyright (c) 2021-2023 Mikhail Knyazhev <markus621@gmail.com>. All rights reserved.
* Use of this source code is governed by a BSD-3-Clause license that can be found in the LICENSE file.
*/

package commands

import (
"os"

"github.com/dewep-online/deb-builder/pkg/pgp"
"github.com/deweppro/go-sdk/console"
"github.com/osspkg/deb-builder/pkg/pgp"
"github.com/osspkg/go-sdk/console"
)

func CreatePGPCert() console.CommandGetter {
Expand Down
31 changes: 18 additions & 13 deletions internal/commands/release.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
/*
* Copyright (c) 2021-2023 Mikhail Knyazhev <markus621@gmail.com>. All rights reserved.
* Use of this source code is governed by a BSD-3-Clause license that can be found in the LICENSE file.
*/

package commands

import (
Expand All @@ -10,15 +15,14 @@ import (
"strings"
"time"

"github.com/dewep-online/deb-builder/pkg/archive"
"github.com/dewep-online/deb-builder/pkg/buffer"
"github.com/dewep-online/deb-builder/pkg/hash"
"github.com/dewep-online/deb-builder/pkg/packages"
"github.com/dewep-online/deb-builder/pkg/utils"
"github.com/deweppro/go-archives/ar"

"github.com/dewep-online/deb-builder/pkg/pgp"
"github.com/deweppro/go-sdk/console"
"github.com/osspkg/deb-builder/pkg/archive"
"github.com/osspkg/deb-builder/pkg/buffer"
"github.com/osspkg/deb-builder/pkg/hash"
"github.com/osspkg/deb-builder/pkg/packages"
"github.com/osspkg/deb-builder/pkg/pgp"
"github.com/osspkg/deb-builder/pkg/utils"
"github.com/osspkg/go-archives/ar"
"github.com/osspkg/go-sdk/console"
)

const (
Expand Down Expand Up @@ -233,11 +237,12 @@ func GenerateRelease() console.CommandGetter {
info := `
=========================== amd64 ===========================
$ wget -qO - https://yourdomain/key.gpg | sudo apt-key add -
$ sudo tee /etc/apt/sources.list.d/yourdomain.list <<'EOF'
deb [arch=amd64] https://yourdomain/ stable main
curl -fsSL https://[yourdomain]/key.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/[yourdomain].gpg
sudo chmod a+r /etc/apt/keyrings/[yourdomain].gpg
sudo tee /etc/apt/sources.list.d/[yourdomain].list <<'EOF'
deb [arch=arm64 signed-by=/etc/apt/keyrings/[yourdomain].gpg] https://[yourdomain]/ stable main
EOF
$ sudo apt-get update
sudo apt update
`

Expand Down
Loading

0 comments on commit 42e55ce

Please sign in to comment.