up: ext flag vars use the goutil/cflag.ext_vars instead

gookit · Oct 16, 2022 · f54ac5a · f54ac5a
1 parent 2490e60
commit f54ac5a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 140 deletions.
diff --git a/gcli.go b/gcli.go
@@ -17,6 +17,7 @@ import (
 	"strings"
 
 	"github.com/gookit/gcli/v3/gflag"
+	"github.com/gookit/goutil/cflag"
 	"github.com/gookit/goutil/envutil"
 )
 
@@ -243,16 +244,16 @@ func IsDebugMode() bool { return gOpts.Verbose >= VerbDebug }
  *************************************************************************/
 
 // Ints The int flag list, implemented flag.Value interface
-type Ints = gflag.Ints
+type Ints = cflag.Ints
 
 // Strings The string flag list, implemented flag.Value interface
-type Strings = gflag.Strings
+type Strings = cflag.Strings
 
 // Booleans The bool flag list, implemented flag.Value interface
-type Booleans = gflag.Booleans
+type Booleans = cflag.Booleans
 
 // EnumString The string flag list, implemented flag.Value interface
-type EnumString = gflag.EnumString
+type EnumString = cflag.EnumString
 
 // String type, a special string
 //
@@ -271,7 +272,7 @@ type EnumString = gflag.EnumString
 //
 //	--names "23,34,56"
 //	 names.Ints(",") -> []int{23,34,56}
-type String = gflag.String
+type String = cflag.String
 
 /*************************************************************************
  * Verbose level

diff --git a/gflag/ext_vars.go b/gflag/ext_vars.go
diff --git a/gflag/gflag.go b/gflag/gflag.go
@@ -2,6 +2,7 @@
 package gflag
 
 import (
+	"github.com/gookit/goutil/cflag"
 	"github.com/gookit/goutil/strutil"
 )
 
@@ -50,3 +51,15 @@ type OptCategory struct {
 	Name, Title string
 	OptNames    []string
 }
+
+// Ints The int flag list, implemented flag.Value interface
+type Ints = cflag.Ints
+
+// Strings The string flag list, implemented flag.Value interface
+type Strings = cflag.Strings
+
+// Booleans The bool flag list, implemented flag.Value interface
+type Booleans = cflag.Booleans
+
+// EnumString The string flag list, implemented flag.Value interface
+type EnumString = cflag.EnumString