Skip to content

Commit

Permalink
Merge pull request #219 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 8.1.1
  • Loading branch information
andyone authored Aug 23, 2024
2 parents 833776d + 42ec183 commit d2da9aa
Show file tree
Hide file tree
Showing 25 changed files with 97 additions and 97 deletions.
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ updates:
target-branch: "develop"
schedule:
interval: "daily"
timezone: "Europe/London"
time: "03:00"
timezone: "Etc/UTC"
time: "07:00"
labels:
- "PR • MAINTENANCE"
assignees:
Expand All @@ -26,8 +26,8 @@ updates:
target-branch: "develop"
schedule:
interval: "daily"
timezone: "Europe/London"
time: "04:00"
timezone: "Etc/UTC"
time: "08:00"
labels:
- "PR • MAINTENANCE"
assignees:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

strategy:
matrix:
go: [ '1.21.x', '1.22.x' ]
go: [ '1.22.x', '1.23.x' ]

steps:
- name: Checkout
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.21.x'
go-version: '1.22.x'

- name: Download dependencies
run: make deps
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ https://github.com/essentialkaos/bibop/assets/182020/c63dc147-fa44-40df-92e2-12f

#### From source

To build the `bibop` from scratch, make sure you have a working Go 1.21+ workspace ([instructions](https://go.dev/doc/install)), then:
To build the `bibop` from scratch, make sure you have a working Go 1.22+ workspace ([instructions](https://go.dev/doc/install)), then:

```
go install github.com/essentialkaos/bibop@latest
Expand Down
2 changes: 1 addition & 1 deletion action/auxi.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"

"github.com/essentialkaos/bibop/recipe"
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v13/strutil"
)

// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down
2 changes: 1 addition & 1 deletion action/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"hash/crc32"
"os"

"github.com/essentialkaos/ek/v12/fsutil"
"github.com/essentialkaos/ek/v13/fsutil"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
4 changes: 2 additions & 2 deletions action/basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"syscall"
"time"

"github.com/essentialkaos/ek/v12/mathutil"
"github.com/essentialkaos/ek/v12/timeutil"
"github.com/essentialkaos/ek/v13/mathutil"
"github.com/essentialkaos/ek/v13/timeutil"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
8 changes: 4 additions & 4 deletions action/fs.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"strconv"
"strings"

"github.com/essentialkaos/ek/v12/fsutil"
"github.com/essentialkaos/ek/v12/hash"
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v12/system"
"github.com/essentialkaos/ek/v13/fsutil"
"github.com/essentialkaos/ek/v13/hash"
"github.com/essentialkaos/ek/v13/strutil"
"github.com/essentialkaos/ek/v13/system"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
2 changes: 1 addition & 1 deletion action/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"fmt"
"strings"

"github.com/essentialkaos/ek/v12/req"
"github.com/essentialkaos/ek/v13/req"

"github.com/buger/jsonparser"

Expand Down
4 changes: 2 additions & 2 deletions action/io.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"strings"
"time"

"github.com/essentialkaos/ek/v12/mathutil"
"github.com/essentialkaos/ek/v12/timeutil"
"github.com/essentialkaos/ek/v13/mathutil"
"github.com/essentialkaos/ek/v13/timeutil"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
6 changes: 3 additions & 3 deletions action/libs.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"path/filepath"
"strings"

"github.com/essentialkaos/ek/v12/fsutil"
"github.com/essentialkaos/ek/v12/sliceutil"
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v13/fsutil"
"github.com/essentialkaos/ek/v13/sliceutil"
"github.com/essentialkaos/ek/v13/strutil"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
6 changes: 3 additions & 3 deletions action/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"fmt"
"time"

"github.com/essentialkaos/ek/v12/initsystem"
"github.com/essentialkaos/ek/v12/mathutil"
"github.com/essentialkaos/ek/v12/timeutil"
"github.com/essentialkaos/ek/v13/initsystem"
"github.com/essentialkaos/ek/v13/mathutil"
"github.com/essentialkaos/ek/v13/timeutil"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
12 changes: 6 additions & 6 deletions action/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ import (
"syscall"
"time"

"github.com/essentialkaos/ek/v12/env"
"github.com/essentialkaos/ek/v12/fsutil"
"github.com/essentialkaos/ek/v12/mathutil"
"github.com/essentialkaos/ek/v12/pid"
"github.com/essentialkaos/ek/v12/signal"
"github.com/essentialkaos/ek/v12/timeutil"
"github.com/essentialkaos/ek/v13/env"
"github.com/essentialkaos/ek/v13/fsutil"
"github.com/essentialkaos/ek/v13/mathutil"
"github.com/essentialkaos/ek/v13/pid"
"github.com/essentialkaos/ek/v13/signal"
"github.com/essentialkaos/ek/v13/timeutil"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
2 changes: 1 addition & 1 deletion action/users.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ package action
import (
"fmt"

"github.com/essentialkaos/ek/v12/system"
"github.com/essentialkaos/ek/v13/system"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
6 changes: 3 additions & 3 deletions cli/barcode.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"fmt"
"os/exec"

"github.com/essentialkaos/ek/v12/env"
"github.com/essentialkaos/ek/v12/fmtutil/barcode"
"github.com/essentialkaos/ek/v12/hash"
"github.com/essentialkaos/ek/v13/env"
"github.com/essentialkaos/ek/v13/fmtutil/barcode"
"github.com/essentialkaos/ek/v13/hash"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
40 changes: 20 additions & 20 deletions cli/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@ import (
"path/filepath"
"strings"

"github.com/essentialkaos/ek/v12/fmtc"
"github.com/essentialkaos/ek/v12/fmtutil"
"github.com/essentialkaos/ek/v12/fmtutil/panel"
"github.com/essentialkaos/ek/v12/fmtutil/table"
"github.com/essentialkaos/ek/v12/fsutil"
"github.com/essentialkaos/ek/v12/options"
"github.com/essentialkaos/ek/v12/req"
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v12/support"
"github.com/essentialkaos/ek/v12/support/deps"
"github.com/essentialkaos/ek/v12/support/pkgs"
"github.com/essentialkaos/ek/v12/terminal"
"github.com/essentialkaos/ek/v12/terminal/tty"
"github.com/essentialkaos/ek/v12/usage"
"github.com/essentialkaos/ek/v12/usage/completion/bash"
"github.com/essentialkaos/ek/v12/usage/completion/fish"
"github.com/essentialkaos/ek/v12/usage/completion/zsh"
"github.com/essentialkaos/ek/v12/usage/man"
"github.com/essentialkaos/ek/v12/usage/update"
"github.com/essentialkaos/ek/v13/fmtc"
"github.com/essentialkaos/ek/v13/fmtutil"
"github.com/essentialkaos/ek/v13/fmtutil/panel"
"github.com/essentialkaos/ek/v13/fmtutil/table"
"github.com/essentialkaos/ek/v13/fsutil"
"github.com/essentialkaos/ek/v13/options"
"github.com/essentialkaos/ek/v13/req"
"github.com/essentialkaos/ek/v13/strutil"
"github.com/essentialkaos/ek/v13/support"
"github.com/essentialkaos/ek/v13/support/deps"
"github.com/essentialkaos/ek/v13/support/pkgs"
"github.com/essentialkaos/ek/v13/terminal"
"github.com/essentialkaos/ek/v13/terminal/tty"
"github.com/essentialkaos/ek/v13/usage"
"github.com/essentialkaos/ek/v13/usage/completion/bash"
"github.com/essentialkaos/ek/v13/usage/completion/fish"
"github.com/essentialkaos/ek/v13/usage/completion/zsh"
"github.com/essentialkaos/ek/v13/usage/man"
"github.com/essentialkaos/ek/v13/usage/update"

"github.com/essentialkaos/bibop/cli/executor"
"github.com/essentialkaos/bibop/parser"
Expand All @@ -44,7 +44,7 @@ import (
// Application info
const (
APP = "bibop"
VER = "8.1.0"
VER = "8.1.1"
DESC = "Utility for testing command-line tools"
)

Expand Down
22 changes: 11 additions & 11 deletions cli/executor/executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ import (
"syscall"
"time"

"github.com/essentialkaos/ek/v12/errutil"
"github.com/essentialkaos/ek/v12/fmtc"
"github.com/essentialkaos/ek/v12/fmtutil/panel"
"github.com/essentialkaos/ek/v12/fsutil"
"github.com/essentialkaos/ek/v12/log"
"github.com/essentialkaos/ek/v12/req"
"github.com/essentialkaos/ek/v12/sliceutil"
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v12/system"
"github.com/essentialkaos/ek/v12/timeutil"
"github.com/essentialkaos/ek/v12/tmp"
"github.com/essentialkaos/ek/v13/errutil"
"github.com/essentialkaos/ek/v13/fmtc"
"github.com/essentialkaos/ek/v13/fmtutil/panel"
"github.com/essentialkaos/ek/v13/fsutil"
"github.com/essentialkaos/ek/v13/log"
"github.com/essentialkaos/ek/v13/req"
"github.com/essentialkaos/ek/v13/sliceutil"
"github.com/essentialkaos/ek/v13/strutil"
"github.com/essentialkaos/ek/v13/system"
"github.com/essentialkaos/ek/v13/timeutil"
"github.com/essentialkaos/ek/v13/tmp"

"github.com/creack/pty"

Expand Down
10 changes: 5 additions & 5 deletions cli/executor/validators.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"regexp"
"strings"

"github.com/essentialkaos/ek/v12/env"
"github.com/essentialkaos/ek/v12/fsutil"
"github.com/essentialkaos/ek/v12/sliceutil"
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v12/system"
"github.com/essentialkaos/ek/v13/env"
"github.com/essentialkaos/ek/v13/fsutil"
"github.com/essentialkaos/ek/v13/sliceutil"
"github.com/essentialkaos/ek/v13/strutil"
"github.com/essentialkaos/ek/v13/system"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
module github.com/essentialkaos/bibop

go 1.19
go 1.21

require (
github.com/buger/jsonparser v1.1.1
github.com/creack/pty v1.1.21
github.com/creack/pty v1.1.23
github.com/essentialkaos/check v1.4.0
github.com/essentialkaos/ek/v12 v12.130.0
github.com/essentialkaos/ek/v13 v13.3.5
)

require (
github.com/essentialkaos/depsy v1.3.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
golang.org/x/sys v0.22.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
golang.org/x/sys v0.24.0 // indirect
)
16 changes: 8 additions & 8 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.21 h1:1/QdRyBaHHJP61QkWMXlOIBfsgdDeeKfK8SYVUWJKf0=
github.com/creack/pty v1.1.21/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0=
github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
github.com/essentialkaos/check v1.4.0 h1:kWdFxu9odCxUqo1NNFNJmguGrDHgwi3A8daXX1nkuKk=
github.com/essentialkaos/check v1.4.0/go.mod h1:LMKPZ2H+9PXe7Y2gEoKyVAwUqXVgx7KtgibfsHJPus0=
github.com/essentialkaos/depsy v1.3.0 h1:CN7bRgBU2jGTHSkg/Sh38eDUn7cvmaTp2sxFt2HpFeU=
github.com/essentialkaos/depsy v1.3.0/go.mod h1:kpiTAV17dyByVnrbNaMcZt2jRwvuXClUYOzpyJQwtG8=
github.com/essentialkaos/ek/v12 v12.130.0 h1:JhcjGZaBIEFfyNReHAHeTgldNv65ruHa9LR7YIVgmn0=
github.com/essentialkaos/ek/v12 v12.130.0/go.mod h1:yGof+LJIkWvQtGINs+2AGv/yeqcfj/brpQ9eYnzMzKs=
github.com/essentialkaos/ek/v13 v13.3.5 h1:k/lfDIpgE+8dOc+eF37m1hOi8eEMHYYTEzD5KHH3xxU=
github.com/essentialkaos/ek/v13 v13.3.5/go.mod h1:FWHXQ74YiSCsi/H9kmHR68fUE8aYUNcp0Fzz98XGUtM=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
4 changes: 2 additions & 2 deletions parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"strconv"
"strings"

"github.com/essentialkaos/ek/v12/fsutil"
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v13/fsutil"
"github.com/essentialkaos/ek/v13/strutil"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
2 changes: 1 addition & 1 deletion recipe/recipe.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"strings"
"time"

"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v13/strutil"
)

// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down
2 changes: 1 addition & 1 deletion recipe/recipe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"testing"
"time"

"github.com/essentialkaos/ek/v12/timeutil"
"github.com/essentialkaos/ek/v13/timeutil"

. "github.com/essentialkaos/check"
)
Expand Down
10 changes: 5 additions & 5 deletions recipe/runtime_variables.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"strings"
"time"

"github.com/essentialkaos/ek/v12/fsutil"
"github.com/essentialkaos/ek/v12/netutil"
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v12/system"
"github.com/essentialkaos/ek/v12/timeutil"
"github.com/essentialkaos/ek/v13/fsutil"
"github.com/essentialkaos/ek/v13/netutil"
"github.com/essentialkaos/ek/v13/strutil"
"github.com/essentialkaos/ek/v13/system"
"github.com/essentialkaos/ek/v13/timeutil"
)

// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down
8 changes: 4 additions & 4 deletions render/renderer_terminal.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"strings"
"time"

"github.com/essentialkaos/ek/v12/fmtc"
"github.com/essentialkaos/ek/v12/fmtutil"
"github.com/essentialkaos/ek/v12/strutil"
"github.com/essentialkaos/ek/v12/terminal/tty"
"github.com/essentialkaos/ek/v13/fmtc"
"github.com/essentialkaos/ek/v13/fmtutil"
"github.com/essentialkaos/ek/v13/strutil"
"github.com/essentialkaos/ek/v13/terminal/tty"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
Loading

0 comments on commit d2da9aa

Please sign in to comment.