diff --git a/base/web/dream.go b/base/web/dream.go index 3d7234e5..f51d4704 100644 --- a/base/web/dream.go +++ b/base/web/dream.go @@ -157,11 +157,15 @@ func _dream_start(m *ice.Message, name string) { func _dream_binary(m *ice.Message, p string) { if bin := path.Join(m.Option(cli.CMD_DIR), ice.BIN_ICE_BIN); nfs.Exists(m, bin) { return - } else if kit.IsUrl(p) { + } else if kit.IsUrl(p) || strings.HasPrefix(p, S()) { GoToast(m, DOWNLOAD, func(toast func(string, int, int)) (list []string) { begin := time.Now() SpideSave(m, bin, kit.MergeURL(p, cli.GOOS, runtime.GOOS, cli.GOARCH, runtime.GOARCH), func(count, total, value int) { - toast(m.Option(mdb.NAME)+"\n"+kit.FormatShow(cli.COST, kit.FmtDuration(time.Now().Sub(begin))), count, total) + if strings.HasPrefix(p, S()) { + toast(m.Option(mdb.NAME), count, total) + } else { + toast(m.Option(mdb.NAME)+"\n"+kit.FormatShow(cli.COST, kit.FmtDuration(time.Now().Sub(begin))), count, total) + } }) return nil }) diff --git a/base/web/matrix.go b/base/web/matrix.go index 2781c0b4..44765104 100644 --- a/base/web/matrix.go +++ b/base/web/matrix.go @@ -4,10 +4,12 @@ import ( "strings" ice "shylinux.com/x/icebergs" + "shylinux.com/x/icebergs/base/aaa" "shylinux.com/x/icebergs/base/cli" "shylinux.com/x/icebergs/base/ctx" "shylinux.com/x/icebergs/base/mdb" "shylinux.com/x/icebergs/base/nfs" + "shylinux.com/x/icebergs/base/tcp" "shylinux.com/x/icebergs/base/web/html" kit "shylinux.com/x/toolkits" ) @@ -76,6 +78,9 @@ func init() { }}, INSTALL: {Hand: func(m *ice.Message, arg ...string) { m.OptionDefault(nfs.BINARY, UserHost(m)+S(m.Option(mdb.NAME))) + if kit.IsIn(m.Cmdv(Space(m, m.Option(DOMAIN)), SPIDE, ice.DEV_IP, CLIENT_HOSTNAME), m.Cmd(tcp.HOST).Appendv(aaa.IP)...) { + m.Option(nfs.BINARY, S(m.Option(mdb.NAME))) + } _matrix_dream(m, mdb.CREATE, kit.Simple(m.OptionSimple(mdb.ICONS, nfs.REPOS, nfs.BINARY))...) _matrix_dream(m, cli.START) }},