liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

add some

Browse Source
This commit is contained in:
IT 老营长 @云轩领航-创始人 2024-03-14 20:58:47 +08:00
parent da8cc86e3a
commit bf91715f8f
4 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/cli/runtime.go
View File

@ -277,8 +277,8 @@ func ParseMake(str string) []string {
version := kit.Format(kit.Value(data, nfs.VERSION)) version := kit.Format(kit.Value(data, nfs.VERSION))
if kit.Format(kit.Value(data, "forword")) != "0" { if kit.Format(kit.Value(data, "forword")) != "0" {
version = kit.Join(kit.TrimArg(kit.Simple( version = kit.Join(kit.TrimArg(kit.Simple(
kit.Format(kit.Value(data, nfs.VERSION)), kit.Select("v0.0.0", kit.Format(kit.Value(data, nfs.VERSION))),
kit.Format(kit.Value(data, "forword")), kit.Select("0", kit.Format(kit.Value(data, "forword"))),
kit.Cut(kit.Format(kit.Value(data, mdb.HASH)), 6), kit.Cut(kit.Format(kit.Value(data, mdb.HASH)), 6),
)...), "-") )...), "-")
} }

2
base/web/dream.go
View File

@ -451,6 +451,8 @@ func init() {
switch m.Option(mdb.TYPE) { switch m.Option(mdb.TYPE) {
case WORKER: case WORKER:
list = append(list, "settings", tcp.SEND, OPEN) list = append(list, "settings", tcp.SEND, OPEN)
case SERVER:
list = append(list, DREAM, OPEN)
default: default:
list = append(list, TOKEN, DREAM, OPEN) list = append(list, TOKEN, DREAM, OPEN)
} }

17
core/code/autogen.go
View File

@ -98,19 +98,18 @@ func _autogen_git(m *ice.Message, arg ...string) ice.Map {
) )
} }
func _autogen_mod(m *ice.Message, file string) (mod string) { func _autogen_mod(m *ice.Message, file string) (mod string) {
host := m.Cmdx(REPOS, REMOTE_URL) host := kit.Select(ice.Info.Make.Remote, m.Cmdx(REPOS, REMOTE_URL))
if host != "" { if host == "" {
host = strings.Split(host, "://")[1] host = m.Option(ice.MSG_USERHOST)
if strings.Contains(host, ":") { if host == "" || !strings.HasPrefix(host, ice.HTTP) {
host = path.Base(host)
}
} else {
host = kit.ParseURL(kit.Select(m.Option(ice.MSG_USERHOST), ice.Info.Make.Remote)).Hostname()
if host == "" {
host = path.Base(kit.Path("")) host = path.Base(kit.Path(""))
} else { } else {
host = strings.Split(host, "://")[1]
host = path.Join(host, "x", path.Base(kit.Path(""))) host = path.Join(host, "x", path.Base(kit.Path("")))
kit.If(strings.Contains(host, ":"), func() { host = path.Base(host) })
} }
} else {
host = strings.Split(host, "://")[1]
} }
m.Cmd(nfs.DEFS, file, kit.Format(nfs.Template(m, ice.GO_MOD), host)) m.Cmd(nfs.DEFS, file, kit.Format(nfs.Template(m, ice.GO_MOD), host))
// ReposAddFile(m, "", ice.GO_MOD) // ReposAddFile(m, "", ice.GO_MOD)

4
core/code/publish.go
View File

@ -46,11 +46,9 @@ func _publish_file(m *ice.Message, file string, arg ...string) string {
} }
func _publish_contexts(m *ice.Message, arg ...string) { func _publish_contexts(m *ice.Message, arg ...string) {
// m.Options(nfs.DIR_ROOT, "") // m.Options(nfs.DIR_ROOT, "")
m.Debug("what %v", m.Option(web.DREAM))
m.Debug("what %v", m.Option(nfs.SOURCE))
m.OptionDefault(web.DOMAIN, tcp.PublishLocalhost(m, web.UserHost(m))) m.OptionDefault(web.DOMAIN, tcp.PublishLocalhost(m, web.UserHost(m)))
m.OptionDefault(cli.CTX_CLI, "temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_dev; else wget -O $temp -q $ctx_dev; fi; source $temp") m.OptionDefault(cli.CTX_CLI, "temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_dev; else wget -O $temp -q $ctx_dev; fi; source $temp")
m.OptionDefault(cli.CTX_ARG, kit.JoinCmds(aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.LANGUAGE, m.Option(ice.MSG_LANGUAGE))) m.OptionDefault(cli.CTX_ARG, kit.JoinCmdArgs(aaa.USERNAME, m.Option(ice.MSG_USERNAME), aaa.USERNICK, m.Option(ice.MSG_USERNICK), aaa.LANGUAGE, m.Option(ice.MSG_LANGUAGE)))
for _, k := range kit.Default(arg, ice.MISC) { for _, k := range kit.Default(arg, ice.MISC) {
env := []string{} env := []string{}
switch k { switch k {