Skip to content

Commit

Permalink
Merge pull request #39 from essentialkaos/develop
Browse files Browse the repository at this point in the history 
Version 2.2.0
  • Loading branch information
@andyone
andyone authored Jul 27, 2020
2 parents 90a618e + 8b0d4f7 commit 5225688
Show file tree
Hide file tree
Showing 16 changed files with 57 additions and 57 deletions.
6 changes: 3 additions & 3 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
################################################################################

# This Makefile generated by GoMakeGen 1.3.0 using next command:
# This Makefile generated by GoMakeGen 1.3.1 using next command:
# gomakegen .
#
# More info: https://kaos.sh/gomakegen
Expand All @@ -27,7 +27,7 @@ git-config: ## Configure git redirects for stable import path services
git config --global http.https://pkg.re.followRedirects true

deps: git-config ## Download dependencies
go get -d -v pkg.re/essentialkaos/ek.v11
go get -d -v pkg.re/essentialkaos/ek.v12

deps-test: git-config ## Download dependencies for tests
go get -d -v pkg.re/check.v1
Expand All @@ -53,6 +53,6 @@ help: ## Show this info
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) \
| awk 'BEGIN {FS = ":.*?## "}; {printf " \033[33m%-12s\033[0m %s\n", $$1, $$2}'
@echo -e ''
@echo -e '\033[90mGenerated by GoMakeGen 1.3.0\033[0m\n'
@echo -e '\033[90mGenerated by GoMakeGen 1.3.1\033[0m\n'

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

"pkg.re/essentialkaos/ek.v11/fsutil"
"pkg.re/essentialkaos/ek.v12/fsutil"

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

"pkg.re/essentialkaos/ek.v11/mathutil"
"pkg.re/essentialkaos/ek.v12/mathutil"

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

"pkg.re/essentialkaos/ek.v11/fsutil"
"pkg.re/essentialkaos/ek.v11/hash"
"pkg.re/essentialkaos/ek.v11/strutil"
"pkg.re/essentialkaos/ek.v11/system"
"pkg.re/essentialkaos/ek.v12/fsutil"
"pkg.re/essentialkaos/ek.v12/hash"
"pkg.re/essentialkaos/ek.v12/strutil"
"pkg.re/essentialkaos/ek.v12/system"

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

"pkg.re/essentialkaos/ek.v11/req"
"pkg.re/essentialkaos/ek.v12/req"

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

"pkg.re/essentialkaos/ek.v11/mathutil"
"pkg.re/essentialkaos/ek.v12/mathutil"

"github.com/essentialkaos/bibop/output"
"github.com/essentialkaos/bibop/recipe"
Expand Down
4 changes: 2 additions & 2 deletions action/libs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"path/filepath"
"strings"

"pkg.re/essentialkaos/ek.v11/fsutil"
"pkg.re/essentialkaos/ek.v11/strutil"
"pkg.re/essentialkaos/ek.v12/fsutil"
"pkg.re/essentialkaos/ek.v12/strutil"

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

"pkg.re/essentialkaos/ek.v11/initsystem"
"pkg.re/essentialkaos/ek.v12/initsystem"

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

"pkg.re/essentialkaos/ek.v11/env"
"pkg.re/essentialkaos/ek.v11/fsutil"
"pkg.re/essentialkaos/ek.v11/mathutil"
"pkg.re/essentialkaos/ek.v11/pid"
"pkg.re/essentialkaos/ek.v11/signal"
"pkg.re/essentialkaos/ek.v12/env"
"pkg.re/essentialkaos/ek.v12/fsutil"
"pkg.re/essentialkaos/ek.v12/mathutil"
"pkg.re/essentialkaos/ek.v12/pid"
"pkg.re/essentialkaos/ek.v12/signal"

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

"pkg.re/essentialkaos/ek.v11/system"
"pkg.re/essentialkaos/ek.v12/system"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
24 changes: 12 additions & 12 deletions cli/cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ import (
"os"
"path/filepath"

"pkg.re/essentialkaos/ek.v11/fmtc"
"pkg.re/essentialkaos/ek.v11/fmtutil"
"pkg.re/essentialkaos/ek.v11/fsutil"
"pkg.re/essentialkaos/ek.v11/options"
"pkg.re/essentialkaos/ek.v11/req"
"pkg.re/essentialkaos/ek.v11/strutil"
"pkg.re/essentialkaos/ek.v11/usage"
"pkg.re/essentialkaos/ek.v11/usage/completion/bash"
"pkg.re/essentialkaos/ek.v11/usage/completion/fish"
"pkg.re/essentialkaos/ek.v11/usage/completion/zsh"
"pkg.re/essentialkaos/ek.v11/usage/update"
"pkg.re/essentialkaos/ek.v12/fmtc"
"pkg.re/essentialkaos/ek.v12/fmtutil"
"pkg.re/essentialkaos/ek.v12/fsutil"
"pkg.re/essentialkaos/ek.v12/options"
"pkg.re/essentialkaos/ek.v12/req"
"pkg.re/essentialkaos/ek.v12/strutil"
"pkg.re/essentialkaos/ek.v12/usage"
"pkg.re/essentialkaos/ek.v12/usage/completion/bash"
"pkg.re/essentialkaos/ek.v12/usage/completion/fish"
"pkg.re/essentialkaos/ek.v12/usage/completion/zsh"
"pkg.re/essentialkaos/ek.v12/usage/update"

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

Expand Down
30 changes: 15 additions & 15 deletions cli/executor/executor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ import (
"strings"
"time"

"pkg.re/essentialkaos/ek.v11/errutil"
"pkg.re/essentialkaos/ek.v11/fmtc"
"pkg.re/essentialkaos/ek.v11/fmtutil"
"pkg.re/essentialkaos/ek.v11/fsutil"
"pkg.re/essentialkaos/ek.v11/log"
"pkg.re/essentialkaos/ek.v11/passwd"
"pkg.re/essentialkaos/ek.v11/sliceutil"
"pkg.re/essentialkaos/ek.v11/strutil"
"pkg.re/essentialkaos/ek.v11/system"
"pkg.re/essentialkaos/ek.v11/terminal/window"
"pkg.re/essentialkaos/ek.v11/tmp"
"pkg.re/essentialkaos/ek.v12/errutil"
"pkg.re/essentialkaos/ek.v12/fmtc"
"pkg.re/essentialkaos/ek.v12/fmtutil"
"pkg.re/essentialkaos/ek.v12/fsutil"
"pkg.re/essentialkaos/ek.v12/log"
"pkg.re/essentialkaos/ek.v12/passwd"
"pkg.re/essentialkaos/ek.v12/sliceutil"
"pkg.re/essentialkaos/ek.v12/strutil"
"pkg.re/essentialkaos/ek.v12/system"
"pkg.re/essentialkaos/ek.v12/terminal/window"
"pkg.re/essentialkaos/ek.v12/tmp"

"github.com/essentialkaos/bibop/action"
"github.com/essentialkaos/bibop/output"
Expand Down Expand Up @@ -241,7 +241,7 @@ func runCommand(e *Executor, c *recipe.Command) bool {
for index, action := range c.Actions {
if !e.config.Quiet {
renderTmpMessage(
" {s-}┖╴{!} {s~-}● {!}"+formatActionName(action)+" {s}%s{!} {s-}[%s]{!}",
" {s-}┖─{!} {s~-}● {!}"+formatActionName(action)+" {s}%s{!} {s-}[%s]{!}",
formatActionArgs(action),
formatDuration(time.Since(e.start), false),
)
Expand All @@ -251,14 +251,14 @@ func runCommand(e *Executor, c *recipe.Command) bool {

if !e.config.Quiet {
if err != nil {
renderTmpMessage(" {s-}┖╴{!} {r}✖ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action))
renderTmpMessage(" {s-}┖─{!} {r}✖ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action))
fmtc.NewLine()
fmtc.Printf(" {r}%v{!}\n", err)
} else {
if index+1 == len(c.Actions) {
renderTmpMessage(" {s-}┖╴{!} {g}✔ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action))
renderTmpMessage(" {s-}┖─{!} {g}✔ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action))
} else {
renderTmpMessage(" {s-}┠╴{!} {g}✔ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action))
renderTmpMessage(" {s-}┠─{!} {g}✔ {!}"+formatActionName(action)+" {s}%s{!}", formatActionArgs(action))
}

fmtc.NewLine()
Expand Down
8 changes: 4 additions & 4 deletions cli/executor/validators.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"regexp"
"strings"

"pkg.re/essentialkaos/ek.v11/fsutil"
"pkg.re/essentialkaos/ek.v11/sliceutil"
"pkg.re/essentialkaos/ek.v11/strutil"
"pkg.re/essentialkaos/ek.v11/system"
"pkg.re/essentialkaos/ek.v12/fsutil"
"pkg.re/essentialkaos/ek.v12/sliceutil"
"pkg.re/essentialkaos/ek.v12/strutil"
"pkg.re/essentialkaos/ek.v12/system"

"github.com/essentialkaos/bibop/recipe"
)
Expand Down
4 changes: 2 additions & 2 deletions parser/parser.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"regexp"
"strings"

"pkg.re/essentialkaos/ek.v11/fsutil"
"pkg.re/essentialkaos/ek.v11/strutil"
"pkg.re/essentialkaos/ek.v12/fsutil"
"pkg.re/essentialkaos/ek.v12/strutil"

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

"pkg.re/essentialkaos/ek.v11/strutil"
"pkg.re/essentialkaos/ek.v12/strutil"
)

// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down
6 changes: 3 additions & 3 deletions recipe/runtime_variables.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"strconv"
"time"

"pkg.re/essentialkaos/ek.v11/fsutil"
"pkg.re/essentialkaos/ek.v11/netutil"
"pkg.re/essentialkaos/ek.v11/system"
"pkg.re/essentialkaos/ek.v12/fsutil"
"pkg.re/essentialkaos/ek.v12/netutil"
"pkg.re/essentialkaos/ek.v12/system"
)

// ////////////////////////////////////////////////////////////////////////////////// //
Expand Down

0 comments on commit 5225688

Please sign in to comment.