From ee2bde3732ed2b0022c65c1725b5ca8313add17a Mon Sep 17 00:00:00 2001
From: shylinux <shylinux@163.com>
Date: Fri, 14 Apr 2023 16:08:22 +0800
Subject: [PATCH] opt some

---
 base/cli/forever.go | 2 +-
 base/nfs/dir.go     | 2 +-
 conf.go             | 5 +++--
 go.mod              | 2 +-
 go.sum              | 4 ++--
 init.go             | 3 +--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/base/cli/forever.go b/base/cli/forever.go
index 87a39a51..fb9830ec 100644
--- a/base/cli/forever.go
+++ b/base/cli/forever.go
@@ -46,7 +46,7 @@ func init() {
 				if bin := kit.Select(os.Args[0], ice.BIN_ICE_BIN, nfs.Exists(m, ice.BIN_ICE_BIN)); len(arg) > 0 && arg[0] == ice.SPACE {
 					m.Cmdy(FOREVER, bin, ice.SPACE, START, ice.DEV, ice.OPS, arg[1:])
 				} else {
-					kit.If(len(arg) == 0 || arg[0] != ice.DEV, func() { arg = append([]string{ice.DEV, ""}, arg...) })
+					kit.If(len(arg) > 0 && arg[0] != ice.DEV, func() { arg = append([]string{ice.DEV, ""}, arg...) })
 					m.Cmdy(FOREVER, bin, ice.SERVE, START, arg)
 				}
 			}},
diff --git a/base/nfs/dir.go b/base/nfs/dir.go
index bddd1154..9bfb84a7 100644
--- a/base/nfs/dir.go
+++ b/base/nfs/dir.go
@@ -35,7 +35,7 @@ func _dir_list(m *ice.Message, root string, dir string, level int, deep bool, di
 			continue
 		}
 		p, pp := path.Join(root, dir, s.Name()), path.Join(dir, s.Name())
-		isDir := s.IsDir() || kit.IsDir(p)
+		isDir := s.IsDir() || kit.IsDir(p) && deep == false
 		if !(dir_type == TYPE_CAT && isDir || dir_type == TYPE_DIR && !isDir) && (dir_reg == nil || dir_reg.MatchString(s.Name())) {
 			switch cb := m.OptionCB("").(type) {
 			case func(os.FileInfo, string):
diff --git a/conf.go b/conf.go
index dfa051a0..97f4cd2b 100644
--- a/conf.go
+++ b/conf.go
@@ -329,8 +329,9 @@ const ( // nfs
 	SCRIPT = "script"
 )
 const ( // cli
-	SYSTEM = "system"
-	START  = "start"
+	FOREVER = "forever"
+	SYSTEM  = "system"
+	START   = "start"
 )
 const ( // log
 	DEBUG = "debug"
diff --git a/go.mod b/go.mod
index 77f1add8..129bc7db 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,6 @@ require (
 	shylinux.com/x/go-qrcode v0.0.2
 	shylinux.com/x/gogit v0.0.7
 	shylinux.com/x/ice v1.3.0
-	shylinux.com/x/toolkits v0.7.4
+	shylinux.com/x/toolkits v0.7.5
 	shylinux.com/x/websocket v0.0.2
 )
diff --git a/go.sum b/go.sum
index b99df9f5..a3f81700 100644
--- a/go.sum
+++ b/go.sum
@@ -4,10 +4,10 @@ shylinux.com/x/go-qrcode v0.0.2 h1:/c0PLj+1RT+kUPfnZVXwgbgH5m1SxBUjM2MIKXbDk+E=
 shylinux.com/x/go-qrcode v0.0.2/go.mod h1:TlzGBENHXy19xC3AsC6h4Vs5fx2ZuDA4TZ0U3C2OeK4=
 shylinux.com/x/gogit v0.0.7 h1:2ep5QpXWLs0UBCywJuUHda/aagskYvFmn0nj3vpEdY4=
 shylinux.com/x/gogit v0.0.7/go.mod h1:wYfHxpQT1C8yNV+yC1jStIy0I12bfUCyJARhn0sNn1M=
-shylinux.com/x/ice v1.3.0 h1:Ro0DpT/qeFPer8R3it9+dptCFprx3/416cJWT3bceWE=
 shylinux.com/x/ice v1.3.0/go.mod h1:sgSlRKoEKnZbmHZ8QuQ3VrFOlW/imi12GX2Z9drkngY=
 shylinux.com/x/icebergs v1.5.4/go.mod h1:njja7CnbJD39p4OGDvIxmh7p8206nAlDiAiTh34CNiw=
-shylinux.com/x/toolkits v0.7.4 h1:PACWkhi/Iv8I+DWUq5y5Uq/Yty58EpyAUeBtDfe6a5g=
 shylinux.com/x/toolkits v0.7.4/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA=
+shylinux.com/x/toolkits v0.7.5 h1:OHk2zLWubFion4cJBo+lSTyzBp3buzV7Xu/Q91Hvf7M=
+shylinux.com/x/toolkits v0.7.5/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA=
 shylinux.com/x/websocket v0.0.2 h1:aeeZyAsh6QN7+l5oMXlO9/rlQgx6CHvDtpZyAqMCSlU=
 shylinux.com/x/websocket v0.0.2/go.mod h1:yMcu4XS6JB11YRISXwvubh7dPM6rWPdzIRv0CrshQBY=
diff --git a/init.go b/init.go
index 461e2978..842c04f0 100644
--- a/init.go
+++ b/init.go
@@ -82,8 +82,7 @@ func Run(arg ...string) string {
 		if runtime.GOOS == "windows" {
 			arg = append(arg, SERVE, START, DEV, DEV)
 		} else {
-			arg = append(arg, "pwd")
-			// arg = append(arg, "forever", START, DEV, DEV)
+			arg = append(arg, FOREVER, START)
 		}
 	}
 	Pulse.meta[MSG_DETAIL] = arg