Skip to content

Commit

Permalink
updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@AspieSoft
AspieSoft committed Oct 20, 2023
1 parent 8f93b4d commit 8b80643
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 30 deletions.
12 changes: 9 additions & 3 deletions bash/bash.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ func Run(args []string, dir string, env []string, liveOutput ...bool) (output []
cmd.Dir = dir
}
if env != nil {
cmd.Env = env
if cmd.Env == nil {
cmd.Env = []string{}
}
cmd.Env = append(cmd.Env, env...)
}
cmd.Stdin = os.Stdin
if len(liveOutput) != 0 && liveOutput[0] == true {
Expand Down Expand Up @@ -148,7 +151,7 @@ func PipeMultiDir(args ...[]string){

// RunRaw will run an unescaped (unquoted) bash command
//
// This used `bash -c` to get around the auto quotes added by golang
// this used `bash -c` to get around the auto quotes added by golang
//
// note: user input is Not recommended for this method
//
Expand All @@ -167,7 +170,10 @@ func RunRaw(cmdStr string, dir string, env []string, liveOutput ...bool) (output
cmd.Dir = dir
}
if env != nil {
cmd.Env = env
if cmd.Env == nil {
cmd.Env = []string{}
}
cmd.Env = append(cmd.Env, env...)
}
cmd.Stdin = os.Stdin
if len(liveOutput) != 0 && liveOutput[0] == true {
Expand Down
2 changes: 1 addition & 1 deletion compress/brotli/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ module github.com/AspieSoft/goutil/compress/brotli

go 1.20

require github.com/andybalholm/brotli v1.0.5
require github.com/andybalholm/brotli v1.0.6
2 changes: 2 additions & 0 deletions compress/brotli/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
github.com/andybalholm/brotli v1.0.5 h1:8uQZIdzKmjc/iuPu7O2ioW48L81FgatrcpfFmiq/cCs=
github.com/andybalholm/brotli v1.0.5/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/andybalholm/brotli v1.0.6 h1:Yf9fFpf49Zrxb9NlQaluyE92/+X7UVHlhMNJN2sxfOI=
github.com/andybalholm/brotli v1.0.6/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
2 changes: 1 addition & 1 deletion cputemp/cputemp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func GetTemp() uint {
//
// by default, if the temperature > HighTemp, it will wait until the temperature <= LowTemp
//
// in strict mode, this will run if temperature
// in strict mode, this will run if temperature > LowTemp
//
// HighTemp = 64
// LowTemp = 56
Expand Down
2 changes: 1 addition & 1 deletion crypt/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/AspieSoft/goutil/crypt

go 1.20

require github.com/AspieSoft/go-regex-re2/v2 v2.1.2
require github.com/AspieSoft/go-regex-re2/v2 v2.2.0

require (
github.com/AspieSoft/go-syncterval v1.0.5 // indirect
Expand Down
4 changes: 2 additions & 2 deletions crypt/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
github.com/AspieSoft/go-regex-re2/v2 v2.1.1 h1:P4+tzLDsjUClPIwCQt+p9XsmFxKS4+1Yv0lawFQU3f8=
github.com/AspieSoft/go-regex-re2/v2 v2.1.1/go.mod h1:Zw3j44LzUQPTpUcy5pzjEP20Jh4025LIeqnX8lJWdCg=
github.com/AspieSoft/go-regex-re2/v2 v2.1.2 h1:Hl6keRAEW5ua1jfoM0bsXUzxRfIxIWR/itNn75ZtNS0=
github.com/AspieSoft/go-regex-re2/v2 v2.1.2/go.mod h1:Zw3j44LzUQPTpUcy5pzjEP20Jh4025LIeqnX8lJWdCg=
github.com/AspieSoft/go-regex-re2/v2 v2.2.0 h1:CK9+SYs7BYy+lV/JrmRbyF+SuTF+e+BIyjKGjKJQzLg=
github.com/AspieSoft/go-regex-re2/v2 v2.2.0/go.mod h1:w+vA1zICvB4OQZGY8KdpyMwjwbFXdnZt9iQ7jRR+ycQ=
github.com/AspieSoft/go-syncterval v1.0.5 h1:fzSNZofSX/7iBkLrWizMzGLGcBl3d+76cHyr8M9tjGg=
github.com/AspieSoft/go-syncterval v1.0.5/go.mod h1:r+mTZPOWvfS0Y5YAxKINGNt8eX76i2Lib0VeqAw3SW4=
github.com/AspieSoft/go-ttlcache v1.2.2 h1:U6MMYY5PKANsB4/vhTiQsQ2U/y1P1yqMCxLw+qFNmCo=
Expand Down
2 changes: 1 addition & 1 deletion fs/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/AspieSoft/goutil/fs/v2
go 1.20

require (
github.com/AspieSoft/go-regex-re2/v2 v2.1.2
github.com/AspieSoft/go-regex-re2/v2 v2.2.0
github.com/alphadose/haxmap v1.3.0
github.com/fsnotify/fsnotify v1.6.0
)
Expand Down
2 changes: 2 additions & 0 deletions fs/go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
github.com/AspieSoft/go-regex-re2/v2 v2.1.2 h1:Hl6keRAEW5ua1jfoM0bsXUzxRfIxIWR/itNn75ZtNS0=
github.com/AspieSoft/go-regex-re2/v2 v2.1.2/go.mod h1:Zw3j44LzUQPTpUcy5pzjEP20Jh4025LIeqnX8lJWdCg=
github.com/AspieSoft/go-regex-re2/v2 v2.2.0 h1:CK9+SYs7BYy+lV/JrmRbyF+SuTF+e+BIyjKGjKJQzLg=
github.com/AspieSoft/go-regex-re2/v2 v2.2.0/go.mod h1:w+vA1zICvB4OQZGY8KdpyMwjwbFXdnZt9iQ7jRR+ycQ=
github.com/AspieSoft/go-syncterval v1.0.5 h1:fzSNZofSX/7iBkLrWizMzGLGcBl3d+76cHyr8M9tjGg=
github.com/AspieSoft/go-syncterval v1.0.5/go.mod h1:r+mTZPOWvfS0Y5YAxKINGNt8eX76i2Lib0VeqAw3SW4=
github.com/AspieSoft/go-ttlcache v1.2.2 h1:U6MMYY5PKANsB4/vhTiQsQ2U/y1P1yqMCxLw+qFNmCo=
Expand Down
10 changes: 1 addition & 9 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,4 @@ module github.com/AspieSoft/goutil/v7

go 1.18

require github.com/AspieSoft/go-regex-re2/v2 v2.1.2

require (
github.com/AspieSoft/go-syncterval v1.0.5 // indirect
github.com/AspieSoft/go-ttlcache v1.2.2 // indirect
github.com/alphadose/haxmap v1.3.0 // indirect
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
)
require github.com/AspieSoft/go-regex-re2/v2 v2.2.0
14 changes: 2 additions & 12 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,2 @@
github.com/AspieSoft/go-regex-re2/v2 v2.1.2 h1:Hl6keRAEW5ua1jfoM0bsXUzxRfIxIWR/itNn75ZtNS0=
github.com/AspieSoft/go-regex-re2/v2 v2.1.2/go.mod h1:Zw3j44LzUQPTpUcy5pzjEP20Jh4025LIeqnX8lJWdCg=
github.com/AspieSoft/go-syncterval v1.0.5 h1:fzSNZofSX/7iBkLrWizMzGLGcBl3d+76cHyr8M9tjGg=
github.com/AspieSoft/go-syncterval v1.0.5/go.mod h1:r+mTZPOWvfS0Y5YAxKINGNt8eX76i2Lib0VeqAw3SW4=
github.com/AspieSoft/go-ttlcache v1.2.2 h1:U6MMYY5PKANsB4/vhTiQsQ2U/y1P1yqMCxLw+qFNmCo=
github.com/AspieSoft/go-ttlcache v1.2.2/go.mod h1:czwXaDat1SKWGJDXkoMZWZFip97MXxuU0KzqJ9zVLDo=
github.com/alphadose/haxmap v1.3.0 h1:C/2LboOnPCZP27GmmSXOcwx360st0P8N0fTJ3voefKc=
github.com/alphadose/haxmap v1.3.0/go.mod h1:rjHw1IAqbxm0S3U5tD16GoKsiAd8FWx5BJ2IYqXwgmM=
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
github.com/AspieSoft/go-regex-re2/v2 v2.2.0 h1:CK9+SYs7BYy+lV/JrmRbyF+SuTF+e+BIyjKGjKJQzLg=
github.com/AspieSoft/go-regex-re2/v2 v2.2.0/go.mod h1:w+vA1zICvB4OQZGY8KdpyMwjwbFXdnZt9iQ7jRR+ycQ=

0 comments on commit 8b80643

Please sign in to comment.