From 1162b66cee4d34f7d5266035d797111b7656a6c3 Mon Sep 17 00:00:00 2001 From: shy Date: Sat, 6 Jan 2024 09:12:41 +0800 Subject: [PATCH] opt relay --- src/template/ssh.relay/pushbin.sh | 6 +++--- src/template/ssh.relay/upgrade.sh | 3 +-- src/template/ssh.relay/version.sh | 4 ++-- src/template/web.chat.header/language/zh-cn.js | 4 ++-- src/template/web.code.publish/source.sh | 2 +- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/template/ssh.relay/pushbin.sh b/src/template/ssh.relay/pushbin.sh index 874eedbf..16a88fc2 100644 --- a/src/template/ssh.relay/pushbin.sh +++ b/src/template/ssh.relay/pushbin.sh @@ -1,3 +1,3 @@ -cd ~/contexts/demo/ -chmod u+x bin/ice.bin -./bin/ice.bin cli.system pwd +cd ~/{{.Option "path"}} +chmod u+x {{.Option "file"}} +./{{.Option "file"}} {{.Option "param"}} diff --git a/src/template/ssh.relay/upgrade.sh b/src/template/ssh.relay/upgrade.sh index 8ed16da7..d608ae86 100644 --- a/src/template/ssh.relay/upgrade.sh +++ b/src/template/ssh.relay/upgrade.sh @@ -1,3 +1,2 @@ -cd ~/contexts -sleep 1 +cd ~/{{.OptionDefault "dream" "contexts"}}; sleep 1 source etc/miss.sh diff --git a/src/template/ssh.relay/version.sh b/src/template/ssh.relay/version.sh index 3a15c63d..bbfde177 100644 --- a/src/template/ssh.relay/version.sh +++ b/src/template/ssh.relay/version.sh @@ -1,2 +1,2 @@ -cd ~/contexts -./bin/ice.bin web.admin vimer compile +cd ~/{{.OptionDefault "dream" "contexts"}}; sleep 1 +./bin/ice.bin admin vimer compile diff --git a/src/template/web.chat.header/language/zh-cn.js b/src/template/web.chat.header/language/zh-cn.js index bb26c942..606da634 100644 --- a/src/template/web.chat.header/language/zh-cn.js +++ b/src/template/web.chat.header/language/zh-cn.js @@ -19,7 +19,7 @@ Volcanos("user", {_trans: kit.Dict("_week_header", ["周日", "周一", "周二" nfs.MODULE, "模块", nfs.SCRIPT, "脚本", nfs.SOURCE, "源码", nfs.CLONE, "克隆", nfs.PUSH, "上传", nfs.PULL, "下载", - nfs.VRESION, "版本", + nfs.VERSION, "版本", nfs.REPOS, "源码", nfs.VRESION, "版本", @@ -71,7 +71,7 @@ Volcanos("user", {_trans: kit.Dict("_week_header", ["周日", "周一", "周二" "commit", "提交", "message", "信息", "subject", "主题", "content", "内容", "commitTime", "发布时间", "compileTime", "编译时间", "bootTime", "启动时间", - "machine", "机器", "params", "参数", + "machine", "机器", "params", "参数", "param", "参数", "click to detail", "点击查看详情", mall.GOODS, "商品", team.ASSET, "资产", diff --git a/src/template/web.code.publish/source.sh b/src/template/web.code.publish/source.sh index 20fe1c07..7bf32b9e 100644 --- a/src/template/web.code.publish/source.sh +++ b/src/template/web.code.publish/source.sh @@ -1 +1 @@ -export ctx_dev={{.Option "domain"}} ctx_repos={{.Option "source"}}{{.Option "ctx_env"}} temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_dev; else wget -O $temp -q $ctx_dev; fi; source $temp source +export ctx_dev={{.Option "domain"}} ctx_repos={{.Option "source"}}{{.Option "ctx_env"}} temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_dev; else wget -O $temp -q $ctx_dev; fi; source $temp source {{.Option "param"}}