From 81d2e285c7c9cc1835d904d84b82895bc319ccf1 Mon Sep 17 00:00:00 2001 From: shy Date: Thu, 7 Dec 2023 11:11:16 +0800 Subject: [PATCH] opt some --- etc/miss.sh | 5 ++--- go.mod | 26 ++++++++++++------------- go.sum | 12 ++++++------ src/main.sh | 3 ++- src/template/web.code.autogen/miss.sh | 2 +- src/template/web.code.publish/source.sh | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/etc/miss.sh b/etc/miss.sh index 5524528e..8235ac5a 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -3,8 +3,7 @@ export ctx_shy=${ctx_shy:=https://shylinux.com} if [ -f $PWD/.ish/plug.sh ]; then source $PWD/.ish/plug.sh; elif [ -f $HOME/.ish/plug.sh ]; then source $HOME/.ish/plug.sh; else temp=$(mktemp); if curl -h &>/dev/null; then curl -o $temp -fsSL $ctx_shy; else wget -O $temp -q $ctx_shy; fi; source $temp intshell -fi; require conf.sh; require miss.sh -ish_sys_cli_prepare +fi; require conf.sh; require miss.sh; ish_sys_cli_prepare ish_miss_prepare_compile ish_miss_prepare_develop @@ -12,8 +11,8 @@ ish_miss_prepare_project ish_miss_prepare_contexts ish_miss_prepare_intshell -ish_miss_prepare_volcanos ish_miss_prepare_learning +ish_miss_prepare_volcanos ish_miss_prepare_toolkits ish_miss_prepare_icebergs ish_miss_prepare_release diff --git a/go.mod b/go.mod index 983dee65..4259cae1 100644 --- a/go.mod +++ b/go.mod @@ -2,20 +2,20 @@ module shylinux.com/x/contexts go 1.13 -replace ( - shylinux.com/x/go-git/v5 => ./usr/go-git - shylinux.com/x/go-qrcode => ./usr/go-qrcode - shylinux.com/x/websocket => ./usr/websocket -) +// replace ( +// shylinux.com/x/go-git/v5 => ./usr/go-git +// shylinux.com/x/go-qrcode => ./usr/go-qrcode +// shylinux.com/x/websocket => ./usr/websocket +// ) -replace ( - shylinux.com/x/ice => ./usr/release - shylinux.com/x/icebergs => ./usr/icebergs - shylinux.com/x/toolkits => ./usr/toolkits -) +// replace ( +// shylinux.com/x/ice => ./usr/release +// shylinux.com/x/icebergs => ./usr/icebergs +// shylinux.com/x/toolkits => ./usr/toolkits +// ) require ( - shylinux.com/x/ice v1.4.0 - shylinux.com/x/icebergs v1.8.0 - shylinux.com/x/toolkits v0.8.0 + shylinux.com/x/ice v1.4.1 + shylinux.com/x/icebergs v1.8.1 + shylinux.com/x/toolkits v0.8.1 ) diff --git a/go.sum b/go.sum index d6ba0616..36907d56 100644 --- a/go.sum +++ b/go.sum @@ -2,12 +2,12 @@ shylinux.com/x/go-git/v5 v5.6.7 h1:WD5QSco7m3QooPCgdvQ6/GyGIFPun8C+hex5N41LYlk= shylinux.com/x/go-git/v5 v5.6.7/go.mod h1:Qb0lA+uIrofZg8NQerhYcJHgGWixFqvS6p3aJ/L5Nlk= shylinux.com/x/go-qrcode v0.0.3 h1:RMo+Vidbgq3HatLBj7DDXcTbTLFUwzis5K7TqBkD38U= shylinux.com/x/go-qrcode v0.0.3/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= -shylinux.com/x/ice v1.4.0 h1:zvOCadnNO3YG9HJG3eKMA02lcYAa9/Xxz/zRJHHktgE= -shylinux.com/x/ice v1.4.0/go.mod h1:kbTampLOb0839lE+9+v6A26fZdYlZABEnRZAlsivc9I= -shylinux.com/x/icebergs v1.8.0 h1:KlR5+O20sneDETKHwIpJBSOIUImbEMuk45kUrH7w7ng= -shylinux.com/x/icebergs v1.8.0/go.mod h1:kvg3BXQzf6N+OVXK30n95E1QhuLjEAJO9bFIEK3DhDw= +shylinux.com/x/ice v1.4.1 h1:UiOJkSaYKrro2qhVhNqjteH/KK4P2kBissxhpMn4Ft0= +shylinux.com/x/ice v1.4.1/go.mod h1:fL9hkig+Aw/ueoVZcrzEzz5CAH47Bw79/eQcjfWLS90= +shylinux.com/x/icebergs v1.8.1 h1:R4UYfwaq1uTutOaeRLideKT0FmwM5434Bi3rzW+Seos= +shylinux.com/x/icebergs v1.8.1/go.mod h1:9YqM6/lgCAUscHblf785QmChCJgdSS3bFNAf+Fd1y6M= shylinux.com/x/toolkits v0.7.10/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q= -shylinux.com/x/toolkits v0.8.0 h1:waiXPHxFv8P8LBN3DHfnyOQ6zWcWLee9db+CRVRhr5Q= -shylinux.com/x/toolkits v0.8.0/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q= +shylinux.com/x/toolkits v0.8.1 h1:7rK3+PVPnO+2ChD/y5vAhC6IWzld0Nk78qjj+M8Q1Ww= +shylinux.com/x/toolkits v0.8.1/go.mod h1:CHDJarGlDkg60kVsvMLYL/a5hAnRLEOShiEsMOuEp0Q= shylinux.com/x/websocket v0.0.3 h1:edhLwCp0Mv1ITXqIwbVWdXdX2+vui/jRnS25K89k68I= shylinux.com/x/websocket v0.0.3/go.mod h1:3UGWkjTu3ie5NAZen7J+uLPBrO7DFeKloj6Jxo13Oiw= diff --git a/src/main.sh b/src/main.sh index dbb796ad..6adf6131 100644 --- a/src/main.sh +++ b/src/main.sh @@ -11,7 +11,8 @@ main() { prepare_system; require miss.sh; [ -f ~/.gitconfig ] || ish_dev_git_prepare git config --global "url.$ctx_dev/x/.insteadof" "${ctx_repos%/*}/" git clone $ctx_repos ${ctx_repos##*/} - cd ${ctx_repos##*/} && source etc/miss.sh dev dev "$@" + cd ${ctx_repos##*/} && source etc/miss.sh + ish_miss_serve_log dev dev "$@" ;; cmd) # 命令环境 ish_sys_dev_init >/dev/null; shift; [ -n "$*" ] && ish_sys_dev_run "$@" diff --git a/src/template/web.code.autogen/miss.sh b/src/template/web.code.autogen/miss.sh index bbd89128..949636d9 100644 --- a/src/template/web.code.autogen/miss.sh +++ b/src/template/web.code.autogen/miss.sh @@ -9,4 +9,4 @@ ish_miss_prepare_compile ish_miss_prepare_develop ish_miss_prepare_project -ish_miss_make +ish_miss_make; [ -z "$*" ] || ish_miss_serve "$@" diff --git a/src/template/web.code.publish/source.sh b/src/template/web.code.publish/source.sh index d2d8bede..20fe1c07 100644 --- a/src/template/web.code.publish/source.sh +++ b/src/template/web.code.publish/source.sh @@ -1 +1 @@ -export ctx_dev={{.Option "domain"}}{{.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