forked from x/icebergs
fix some
This commit is contained in:
parent
da37a136e1
commit
a6b48d55d8
@ -11,7 +11,6 @@ import (
|
|||||||
"shylinux.com/x/icebergs/base/mdb"
|
"shylinux.com/x/icebergs/base/mdb"
|
||||||
"shylinux.com/x/icebergs/base/nfs"
|
"shylinux.com/x/icebergs/base/nfs"
|
||||||
kit "shylinux.com/x/toolkits"
|
kit "shylinux.com/x/toolkits"
|
||||||
"shylinux.com/x/toolkits/logs"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func _command_list(m *ice.Message, name string) *ice.Message {
|
func _command_list(m *ice.Message, name string) *ice.Message {
|
||||||
@ -162,8 +161,7 @@ func FileCmd(dir string) string {
|
|||||||
func AddFileCmd(dir, key string) {
|
func AddFileCmd(dir, key string) {
|
||||||
ice.Info.File[FileCmd(dir)] = key
|
ice.Info.File[FileCmd(dir)] = key
|
||||||
if ls := strings.SplitN(path.Join(kit.Slice(kit.Split(FileCmd(dir), nfs.PS), 1, 4)...), mdb.AT, 2); len(ls) > 1 {
|
if ls := strings.SplitN(path.Join(kit.Slice(kit.Split(FileCmd(dir), nfs.PS), 1, 4)...), mdb.AT, 2); len(ls) > 1 {
|
||||||
logs.Println("add file cmd %v %v", strings.Replace(FileCmd(dir), mdb.AT+ls[1], "", 1), key)
|
ice.Info.File["/require/usr/"+strings.Split(FileCmd(dir), mdb.AT+ls[1]+nfs.PS)[1]] = key
|
||||||
ice.Info.File[strings.Replace(FileCmd(dir), mdb.AT+ls[1], "", 1)] = key
|
|
||||||
ice.Info.Gomod[ls[0]] = ls[1]
|
ice.Info.Gomod[ls[0]] = ls[1]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -174,7 +172,6 @@ func GetFileCmd(dir string) string {
|
|||||||
dir = path.Join(nfs.PS, ice.REQUIRE, strings.TrimPrefix(dir, ice.ISH_PLUGED))
|
dir = path.Join(nfs.PS, ice.REQUIRE, strings.TrimPrefix(dir, ice.ISH_PLUGED))
|
||||||
}
|
}
|
||||||
for _, dir := range []string{dir, path.Join(nfs.PS, ice.REQUIRE, ice.Info.Make.Module, dir), path.Join(nfs.PS, ice.REQUIRE, ice.Info.Make.Module, ice.SRC, dir)} {
|
for _, dir := range []string{dir, path.Join(nfs.PS, ice.REQUIRE, ice.Info.Make.Module, dir), path.Join(nfs.PS, ice.REQUIRE, ice.Info.Make.Module, ice.SRC, dir)} {
|
||||||
logs.Println("get file cmd %v %v", FileCmd(dir), dir)
|
|
||||||
if cmd, ok := ice.Info.File[FileCmd(dir)]; ok {
|
if cmd, ok := ice.Info.File[FileCmd(dir)]; ok {
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user