Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2024-12-24 17:08:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove shellescape dependency

Browse Source
This commit is contained in:
sawka 2022-11-14 13:56:50 -08:00
parent 24f17ff5e9
commit 55767e3256
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/utilfn/utilfn.go
View File

@ -1,9 +1,8 @@
package utilfn
import (
"regexp"
"strings"
"github.com/alessio/shellescape"
)
func GetStrArr(v interface{}, field string) []string {
@ -50,12 +49,17 @@ func GetBool(v interface{}, field string) bool {
return bval
}
var needsQuoteRe = regexp.MustCompile(`[^\w@%:,./=+-]`)
// minimum maxlen=6
func ShellQuote(val string, forceQuote bool, maxLen int) string {
if maxLen < 6 {
maxLen = 6
}
rtn := shellescape.Quote(val)
rtn := val
if needsQuoteRe.MatchString(val) {
rtn = "'" + strings.ReplaceAll(val, "'", `'"'"'`) + "'"
}
if strings.HasPrefix(rtn, "\"") || strings.HasPrefix(rtn, "'") {
if len(rtn) > maxLen {
return rtn[0:maxLen-4] + "..." + rtn[0:1]