diff --git a/conf.go b/conf.go index ca6ab0a1..445bff81 100644 --- a/conf.go +++ b/conf.go @@ -146,37 +146,38 @@ const ( // DIR VAR_LOG_BOOT_LOG = "var/log/boot.log" VAR_LOG_ICE_PID = "var/log/ice.pid" - VAR_LOG = "var/log/" - VAR_TMP = "var/tmp/" - VAR_CONF = "var/conf/" - VAR_DATA = "var/data/" - VAR_FILE = "var/file/" - VAR_PROXY = "var/proxy/" - VAR_TRASH = "var/trash/" - BIN_ICE_BIN = "bin/ice.bin" - ETC_INIT_SHY = "etc/init.shy" - ETC_LOCAL_SHY = "etc/local.shy" - ETC_EXIT_SHY = "etc/exit.shy" - ETC_MISS_SH = "etc/miss.sh" - ETC_PATH = "etc/path" - SRC_MAIN_SHY = "src/main.shy" - SRC_MAIN_SH = "src/main.sh" - SRC_MAIN_JS = "src/main.js" - SRC_MAIN_GO = "src/main.go" - SRC_WEBVIEW_GO = "src/webview.go" - SRC_VERSION_GO = "src/version.go" - SRC_BINPACK_GO = "src/binpack.go" - SRC_DOCUMENT = "src/document/" - SRC_TEMPLATE = "src/template/" - SRC_SCRIPT = "src/script/" - USR_SCRIPT = "usr/script/" - README_MD = "README.md" - MAKEFILE = "Makefile" - LICENSE = "LICENSE" - GO_MOD = "go.mod" - GO_SUM = "go.sum" - ICE_BIN = "ice.bin" - CAN_PLUGIN = "can._plugin" + VAR_LOG = "var/log/" + VAR_TMP = "var/tmp/" + VAR_CONF = "var/conf/" + VAR_DATA = "var/data/" + VAR_FILE = "var/file/" + VAR_PROXY = "var/proxy/" + VAR_TRASH = "var/trash/" + BIN_ICE_BIN = "bin/ice.bin" + ETC_INIT_SHY = "etc/init.shy" + ETC_LOCAL_SHY = "etc/local.shy" + ETC_PRIVATE_SHY = "etc/private.shy" + ETC_EXIT_SHY = "etc/exit.shy" + ETC_MISS_SH = "etc/miss.sh" + ETC_PATH = "etc/path" + SRC_MAIN_SHY = "src/main.shy" + SRC_MAIN_SH = "src/main.sh" + SRC_MAIN_JS = "src/main.js" + SRC_MAIN_GO = "src/main.go" + SRC_WEBVIEW_GO = "src/webview.go" + SRC_VERSION_GO = "src/version.go" + SRC_BINPACK_GO = "src/binpack.go" + SRC_DOCUMENT = "src/document/" + SRC_TEMPLATE = "src/template/" + SRC_SCRIPT = "src/script/" + USR_SCRIPT = "usr/script/" + README_MD = "README.md" + MAKEFILE = "Makefile" + LICENSE = "LICENSE" + GO_MOD = "go.mod" + GO_SUM = "go.sum" + ICE_BIN = "ice.bin" + CAN_PLUGIN = "can._plugin" ) const ( // MSG MSG_CMDS = "cmds" diff --git a/misc/git/repos.go b/misc/git/repos.go index ea061276..f44ddeb5 100644 --- a/misc/git/repos.go +++ b/misc/git/repos.go @@ -231,7 +231,7 @@ func _repos_status(m *ice.Message, p string, repos *git.Repository) error { return err } for k, v := range status { - if kit.IsIn(k, ice.SRC_VERSION_GO, ice.SRC_BINPACK_GO, ice.ETC_LOCAL_SHY) { + if kit.IsIn(k, ice.SRC_VERSION_GO, ice.SRC_BINPACK_GO, ice.ETC_LOCAL_SHY, ice.ETC_PRIVATE_SHY) { continue } else if kit.IsIn(kit.Ext(k), "swp", "swo") || kit.HasPrefix(k, nfs.BIN, nfs.VAR, nfs.USR) && !strings.HasPrefix(k, ice.USR_LOCAL_EXPORT) { continue