diff --git a/base/cli/forever.go b/base/cli/forever.go index d91f201b..b10b2777 100644 --- a/base/cli/forever.go +++ b/base/cli/forever.go @@ -2,7 +2,6 @@ package cli import ( "os" - "path" ice "shylinux.com/x/icebergs" "shylinux.com/x/icebergs/base/gdb" @@ -62,7 +61,6 @@ func init() { if logs.Println(); m.Config("log.save") == ice.TRUE { back := kit.Format("var/log.%s", logs.Now().Format("20060102_150405")) m.Cmd(SYSTEM, "cp", "-r", "var/log", back, ice.Maps{CMD_OUTPUT: ""}) - m.Cmd(SYSTEM, "cp", "bin/boot.log", path.Join(back, "boot.log"), ice.Maps{CMD_OUTPUT: ""}) } } }}, diff --git a/base/cli/runtime.go b/base/cli/runtime.go index abf786a1..05849b98 100644 --- a/base/cli/runtime.go +++ b/base/cli/runtime.go @@ -29,7 +29,7 @@ func _runtime_init(m *ice.Message) { for _, k := range ENV_LIST { switch m.Conf(RUNTIME, kit.Keys(CONF, k), kit.Env(k)); k { case CTX_PID: - ice.Info.PidPath = kit.Select(path.Join(ice.VAR_RUN, "ice.pid"), kit.Env(k)) + ice.Info.PidPath = kit.Select(path.Join(ice.VAR_LOG, ice.ICE_PID), kit.Env(k)) case CTX_SHARE: ice.Info.CtxShare = kit.Env(k) case CTX_RIVER: diff --git a/conf.go b/conf.go index 30f10209..0355f43d 100644 --- a/conf.go +++ b/conf.go @@ -120,7 +120,6 @@ const ( // DIR USR_LOCAL_EXPORT = "usr/local/export/" USR_LOCAL_REPOS = "usr/local/repos/" - VAR_RUN = "var/run/" VAR_TMP = "var/tmp/" VAR_LOG = "var/log/" VAR_CONF = "var/conf/" @@ -149,6 +148,7 @@ const ( // DIR MAKEFILE = "Makefile" LICENSE = "LICENSE" ICE_BIN = "ice.bin" + ICE_PID = "ice.pid" GO_SUM = "go.sum" GO_MOD = "go.mod" )