diff --git a/base/nfs/dir.go b/base/nfs/dir.go index 7b1ba502..f4fc0450 100644 --- a/base/nfs/dir.go +++ b/base/nfs/dir.go @@ -149,7 +149,6 @@ const ( SRC_TEMPLATE = ice.SRC_TEMPLATE USR_ICEBERGS = ice.USR_ICEBERGS USR_PUBLISH = ice.USR_PUBLISH - USR_PORTAL = ice.USR_PORTAL USR_LOCAL = ice.USR_LOCAL USR_LOCAL_WORK = ice.USR_LOCAL_WORK USR_LOCAL_IMAGE = "usr/local/image/" diff --git a/conf.go b/conf.go index 28db0c33..d998c632 100644 --- a/conf.go +++ b/conf.go @@ -124,7 +124,6 @@ const ( // DIR USR_RELEASE = "usr/release/" USR_PROGRAM = "usr/program/" USR_GEOAREA = "usr/geoarea/" - USR_PORTAL = "usr/portal/" USR_ICONS = "usr/icons/" USR_LOCAL = "usr/local/" @@ -149,6 +148,7 @@ const ( // DIR VAR_FILE = "var/file/" VAR_PROXY = "var/proxy/" VAR_TRASH = "var/trash/" + VAR_PORTAL = "var/portal/" BIN_ICE_BIN = "bin/ice.bin" ETC_INIT_SHY = "etc/init.shy" ETC_LOCAL_SHY = "etc/local.shy" diff --git a/core/wiki/portal.go b/core/wiki/portal.go index 0b13b21b..00b0d373 100644 --- a/core/wiki/portal.go +++ b/core/wiki/portal.go @@ -72,7 +72,7 @@ func init() { Index.MergeCommands(ice.Commands{ PORTAL: {Name: "portal path auto", Help: "官网", Role: aaa.VOID, Actions: ice.MergeActions(ice.Actions{ ctx.RUN: {Hand: func(m *ice.Message, arg ...string) { - if p := path.Join(ice.USR_PORTAL, path.Join(arg...)); (m.Option(ice.DEBUG) == ice.TRUE || !nfs.ExistsFile(m, p)) && aaa.Right(m.Spawn(), arg) { + if p := path.Join(ice.VAR_PORTAL, path.Join(arg...)); (m.Option(ice.DEBUG) == ice.TRUE || !nfs.ExistsFile(m, p)) && aaa.Right(m.Spawn(), arg) { ctx.Run(m, arg...) m.Cmd(nfs.SAVE, p, ice.Maps{nfs.CONTENT: m.FormatsMeta(nil), nfs.DIR_ROOT: ""}) } else {