From c36c6f895025b28e99ed36fe9192228801ca0a1f Mon Sep 17 00:00:00 2001 From: harveyshao Date: Sat, 23 Apr 2022 11:49:12 +0800 Subject: [PATCH] opt some --- Makefile | 7 ++++--- bin/ice.sh | 23 ----------------------- etc/miss.sh | 3 ++- go.mod | 28 ++++++---------------------- go.sum | 17 ++++++++++++++++- src/debug/go.mod | 16 ++++++++-------- src/release/go.mod | 12 ++++++------ src/release/go.sum | 35 ++++++++++++++++------------------- 8 files changed, 58 insertions(+), 83 deletions(-) delete mode 100755 bin/ice.sh diff --git a/Makefile b/Makefile index 07aecbd7..67307556 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,12 @@ export CGO_ENABLED=0 -publish_ice = usr/publish/ice.$(shell go env GOOS).$(shell go env GOARCH) +binarys = bin/ice.bin +publish = usr/publish/ice.$(shell go env GOOS).$(shell go env GOARCH) all: def @echo && date - go build -v -o bin/ice.bin src/main.go src/version.go src/binpack.go && chmod u+x bin/ice.bin && ./bin/ice.sh restart - rm ${publish_ice}; cp bin/ice.bin ${publish_ice} + go build -v -o ${binarys} src/main.go src/version.go src/binpack.go && ./${binarys} forever restart &>/dev/null + mkdir $(dir ${publish}) &>/dev/null; rm ${publish} &>/dev/null; cp ${binarys} ${publish} def: @ [ -f src/version.go ] || echo "package main" > src/version.go diff --git a/bin/ice.sh b/bin/ice.sh deleted file mode 100755 index 7371ba6c..00000000 --- a/bin/ice.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -export ctx_log=${ctx_log:=bin/boot.log} -export ctx_pid=${ctx_pid:=var/run/ice.pid} - -start() { - trap HUP hup && while true; do - date && bin/ice.bin $@ 2>$ctx_log && break || echo -e \"\n\nrestarting...\" - sleep 1 - done -} -restart() { - [ -e $ctx_pid ] && kill -2 `cat $ctx_pid` &>/dev/null || echo -} -stop() { - [ -e $ctx_pid ] && kill -3 `cat $ctx_pid` &>/dev/null || echo -} -serve() { - stop && start $@ -} - -cmd=$1 && [ -n \"$cmd\" ] && shift || cmd=serve -$cmd $* diff --git a/etc/miss.sh b/etc/miss.sh index df80162a..f0a15e93 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -32,7 +32,8 @@ ish_miss_prepare_icebergs ish_miss_prepare_toolkits ish_miss_prepare_volcanos ish_miss_prepare_learning -ish_miss_make + +ish_miss_make; if [ -n "$*" ]; then ./bin/ice.bin forever serve "$@"; fi ish_sys_link_create ~/.vim_local.vim $PWD/etc/conf/vim_local.vim require dev/vim/vim.sh diff --git a/go.mod b/go.mod index e3938e9c..380a4836 100644 --- a/go.mod +++ b/go.mod @@ -2,28 +2,12 @@ module shylinux.com/x/contexts go 1.11 -require shylinux.com/x/ice v0.9.0 +require shylinux.com/x/ice v0.9.2 require ( - shylinux.com/x/golang-story v0.3.8 - shylinux.com/x/icebergs v1.1.7 - shylinux.com/x/linux-story v0.3.6 - shylinux.com/x/mysql-story v0.3.9 - shylinux.com/x/nginx-story v0.3.9 - shylinux.com/x/redis-story v0.3.9 - shylinux.com/x/toolkits v0.5.7 -) - -replace ( - shylinux.com/x/ice => ./usr/release - shylinux.com/x/icebergs => ./usr/icebergs - shylinux.com/x/toolkits => ./usr/toolkits -) - -replace ( - shylinux.com/x/golang-story => ./usr/golang-story - shylinux.com/x/linux-story => ./usr/linux-story - shylinux.com/x/mysql-story => ./usr/mysql-story - shylinux.com/x/nginx-story => ./usr/nginx-story - shylinux.com/x/redis-story => ./usr/redis-story + shylinux.com/x/golang-story v0.4.0 + shylinux.com/x/linux-story v0.3.8 + shylinux.com/x/mysql-story v0.4.1 + shylinux.com/x/nginx-story v0.4.1 + shylinux.com/x/redis-story v0.4.1 ) diff --git a/go.sum b/go.sum index 715483bb..cc2d9aea 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,21 @@ shylinux.com/x/go-qrcode v0.0.1 h1:/eOGqMj1qtgs9Ymd12zTUa1gcJZs9S92kj2lb0QzKsE= shylinux.com/x/go-qrcode v0.0.1/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= shylinux.com/x/go-sql-mysql v0.0.1 h1:VX5SrwLBKzfkRouj39LgJ9reIXOWmMsScRpr+e0qdp0= shylinux.com/x/go-sql-mysql v0.0.1/go.mod h1:47OfAZK24HRJMy7dAu/jrksGCf9yzJaAUFwWYjhDFDA= +shylinux.com/x/golang-story v0.4.0 h1:wh1j/QwE+K2P/Lhpu/69Oz7lq4T36uv57Gwn5+cm3js= +shylinux.com/x/golang-story v0.4.0/go.mod h1:YnxxNGf1G5c1YhnJQjJFOBtdH4oVubApJVv/mwR1gzU= +shylinux.com/x/ice v0.9.2 h1:vQJ2Y0XEam0MZPsks0NwReMtBVR520oLV//kAEHPjSA= +shylinux.com/x/ice v0.9.2/go.mod h1:PpQGqtfeQj/MvE/55iDuzdkzN7lcZu7fglI+5/YDudY= +shylinux.com/x/icebergs v1.1.8 h1:s++RU9noOeR+g/oChxKBFV8JtNKWchL/iKzwtiwDsvE= +shylinux.com/x/icebergs v1.1.8/go.mod h1:IWYdPq5nI+Vcr/5m7xvScBM1DyOsQZDDvBa0ffyIOBM= +shylinux.com/x/linux-story v0.3.8 h1:1oAFhhs8p7PRLmg1mrIb6y7xe6IK6E/DQXOjx7n+QrY= +shylinux.com/x/linux-story v0.3.8/go.mod h1:W/QN4t6ZHVaFQ9djKIp824ZAAttZXNexzY7FwsYDU7Y= +shylinux.com/x/mysql-story v0.4.1 h1:6T+bK0IOy9y+lGqWjO1Sv9D1oKy59kMQ5sZVmWJCDdc= +shylinux.com/x/mysql-story v0.4.1/go.mod h1:xgNzoJQSIIO/TnY3VYPeiPJQT2OIMH7ZKepf7YKPvxw= +shylinux.com/x/nginx-story v0.4.1 h1:YUz8f5v4z6gqGT3TZVEiNPRgA8FsCVfmOIOXn+LS5tU= +shylinux.com/x/nginx-story v0.4.1/go.mod h1:WC4YB+BFg+3mDO/zSZk0iMlZOTQ1H1KzAD+0T9/3Gxg= +shylinux.com/x/redis-story v0.4.1 h1:nwsawHizGZoo+rSxkmaJ+JZcrIj7HuOToAZyKYQtcDY= +shylinux.com/x/redis-story v0.4.1/go.mod h1:Uqs1TtW8aFuGhIVxsMNJjATkmIXesbWDUFeegY+Sr0w= +shylinux.com/x/toolkits v0.5.8 h1:8MhHLmglPTPiXAdUgAJXx+gOxJoQzmpNeC7QzsZcjJw= +shylinux.com/x/toolkits v0.5.8/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= shylinux.com/x/websocket v0.0.1 h1:OBc21DxqsGlQ2+Pz76xqLyDNo1LV+PUUqfWi+1PZPDE= shylinux.com/x/websocket v0.0.1/go.mod h1:AaSpMToOxbMULKQytzczeHPuqb708vK1vrAzCxLo/XE= -shylinux.com/x/webview v0.0.1/go.mod h1:4QYVOgAZyyoCghh0ByuAXqfcuFWCJQY3F7Ss2x3N/cQ= diff --git a/src/debug/go.mod b/src/debug/go.mod index 5a8e3dce..447dc53e 100644 --- a/src/debug/go.mod +++ b/src/debug/go.mod @@ -2,16 +2,16 @@ module shylinux.com/x/contexts go 1.11 -require shylinux.com/x/ice v0.9.0 +require shylinux.com/x/ice v0.9.2 require ( - shylinux.com/x/golang-story v0.3.8 - shylinux.com/x/icebergs v1.1.7 - shylinux.com/x/linux-story v0.3.6 - shylinux.com/x/mysql-story v0.3.9 - shylinux.com/x/nginx-story v0.3.9 - shylinux.com/x/redis-story v0.3.9 - shylinux.com/x/toolkits v0.5.7 + shylinux.com/x/golang-story v0.4.0 + shylinux.com/x/icebergs v1.1.8 + shylinux.com/x/linux-story v0.3.8 + shylinux.com/x/mysql-story v0.4.1 + shylinux.com/x/nginx-story v0.4.1 + shylinux.com/x/redis-story v0.4.1 + shylinux.com/x/toolkits v0.5.8 shylinux.com/x/webview v0.0.1 ) diff --git a/src/release/go.mod b/src/release/go.mod index e889f748..380a4836 100644 --- a/src/release/go.mod +++ b/src/release/go.mod @@ -2,12 +2,12 @@ module shylinux.com/x/contexts go 1.11 -require shylinux.com/x/ice v0.9.0 +require shylinux.com/x/ice v0.9.2 require ( - shylinux.com/x/golang-story v0.3.8 - shylinux.com/x/linux-story v0.3.6 - shylinux.com/x/mysql-story v0.3.9 - shylinux.com/x/nginx-story v0.3.9 - shylinux.com/x/redis-story v0.3.9 + shylinux.com/x/golang-story v0.4.0 + shylinux.com/x/linux-story v0.3.8 + shylinux.com/x/mysql-story v0.4.1 + shylinux.com/x/nginx-story v0.4.1 + shylinux.com/x/redis-story v0.4.1 ) diff --git a/src/release/go.sum b/src/release/go.sum index 23e8f6f2..cc2d9aea 100644 --- a/src/release/go.sum +++ b/src/release/go.sum @@ -2,24 +2,21 @@ shylinux.com/x/go-qrcode v0.0.1 h1:/eOGqMj1qtgs9Ymd12zTUa1gcJZs9S92kj2lb0QzKsE= shylinux.com/x/go-qrcode v0.0.1/go.mod h1:KAbtU+KwiiABMZ/CJ0zh9PI2AX82Uf9rRYcQ4ODm4po= shylinux.com/x/go-sql-mysql v0.0.1 h1:VX5SrwLBKzfkRouj39LgJ9reIXOWmMsScRpr+e0qdp0= shylinux.com/x/go-sql-mysql v0.0.1/go.mod h1:47OfAZK24HRJMy7dAu/jrksGCf9yzJaAUFwWYjhDFDA= -shylinux.com/x/golang-story v0.3.8 h1:qFYQ83c+C/JrB4huPl6vrFARPu38ON8Zip+vHsKi8Hk= -shylinux.com/x/golang-story v0.3.8/go.mod h1:+gU8f1IQOq87kg6AGWf8GLTbZe+O941Q3XnCCJIRW8U= -shylinux.com/x/ice v0.8.7/go.mod h1:gCGjXbo1Ze6kbcmob+GDuEsAigCcno6kjK8LtdkMTUU= -shylinux.com/x/ice v0.9.0 h1:FTjBxs9Zo1pAAW+BqpxMvzpPIF3TtjHMMzKVygmcflg= -shylinux.com/x/ice v0.9.0/go.mod h1:Ttd5S1h54XAk0xXpjG1Jncey8oYXjXwQ1RdJZ1h/4SI= -shylinux.com/x/icebergs v1.1.3/go.mod h1:SwEzucaBu2/2pWQrBDG8jMsgZLzQwftzULiPK3cSp8M= -shylinux.com/x/icebergs v1.1.7 h1:eyBdT7OzqWX0onsjYk/Re/k0mICHqB2fVo6fwe84CAc= -shylinux.com/x/icebergs v1.1.7/go.mod h1:7qyESQEF0S9MUzrVv29hLsgvflVv7/dr8BOk0Nxej1A= -shylinux.com/x/linux-story v0.3.6 h1:l0vEmbrrOP+UZywoRUdv5K1JorwUYJ+gz6ud8zh/eFs= -shylinux.com/x/linux-story v0.3.6/go.mod h1:pkB+RVnf2ZJwYTVqggxPPDAjUzdQdRwUd7MTGpLsBxc= -shylinux.com/x/mysql-story v0.3.9 h1:1WmoYz5zkbFv4ttUgnwMaSNtisg9+y9btyvjGq0+VGA= -shylinux.com/x/mysql-story v0.3.9/go.mod h1:d2qq03o6y3M1CuaykGXMQmS8XK4sutSCZBcH8kxRXrQ= -shylinux.com/x/nginx-story v0.3.9 h1:07wmLndioi3Nfx9qCrwZcEoLoZLlKGeIF72Uq5IfNaw= -shylinux.com/x/nginx-story v0.3.9/go.mod h1:DTG3ed7j0q9hrSm2A7mObzm3CRXZpCHYZm6A+DszAp8= -shylinux.com/x/redis-story v0.3.9 h1:yHG6gNBa0xzXpUhKyWZ69TaBzeb/kaElTBGVaDAQ4W8= -shylinux.com/x/redis-story v0.3.9/go.mod h1:NbMWT/A2Shcd5n6Ro3uvsxdz2+V/EPeA3vKIXdIWsQs= -shylinux.com/x/toolkits v0.5.4/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= -shylinux.com/x/toolkits v0.5.7 h1:egzaV8Y59g9l6wTXKpYu4otVBVJRInvoPt0tIXGhh7Q= -shylinux.com/x/toolkits v0.5.7/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= +shylinux.com/x/golang-story v0.4.0 h1:wh1j/QwE+K2P/Lhpu/69Oz7lq4T36uv57Gwn5+cm3js= +shylinux.com/x/golang-story v0.4.0/go.mod h1:YnxxNGf1G5c1YhnJQjJFOBtdH4oVubApJVv/mwR1gzU= +shylinux.com/x/ice v0.9.2 h1:vQJ2Y0XEam0MZPsks0NwReMtBVR520oLV//kAEHPjSA= +shylinux.com/x/ice v0.9.2/go.mod h1:PpQGqtfeQj/MvE/55iDuzdkzN7lcZu7fglI+5/YDudY= +shylinux.com/x/icebergs v1.1.8 h1:s++RU9noOeR+g/oChxKBFV8JtNKWchL/iKzwtiwDsvE= +shylinux.com/x/icebergs v1.1.8/go.mod h1:IWYdPq5nI+Vcr/5m7xvScBM1DyOsQZDDvBa0ffyIOBM= +shylinux.com/x/linux-story v0.3.8 h1:1oAFhhs8p7PRLmg1mrIb6y7xe6IK6E/DQXOjx7n+QrY= +shylinux.com/x/linux-story v0.3.8/go.mod h1:W/QN4t6ZHVaFQ9djKIp824ZAAttZXNexzY7FwsYDU7Y= +shylinux.com/x/mysql-story v0.4.1 h1:6T+bK0IOy9y+lGqWjO1Sv9D1oKy59kMQ5sZVmWJCDdc= +shylinux.com/x/mysql-story v0.4.1/go.mod h1:xgNzoJQSIIO/TnY3VYPeiPJQT2OIMH7ZKepf7YKPvxw= +shylinux.com/x/nginx-story v0.4.1 h1:YUz8f5v4z6gqGT3TZVEiNPRgA8FsCVfmOIOXn+LS5tU= +shylinux.com/x/nginx-story v0.4.1/go.mod h1:WC4YB+BFg+3mDO/zSZk0iMlZOTQ1H1KzAD+0T9/3Gxg= +shylinux.com/x/redis-story v0.4.1 h1:nwsawHizGZoo+rSxkmaJ+JZcrIj7HuOToAZyKYQtcDY= +shylinux.com/x/redis-story v0.4.1/go.mod h1:Uqs1TtW8aFuGhIVxsMNJjATkmIXesbWDUFeegY+Sr0w= +shylinux.com/x/toolkits v0.5.8 h1:8MhHLmglPTPiXAdUgAJXx+gOxJoQzmpNeC7QzsZcjJw= +shylinux.com/x/toolkits v0.5.8/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= shylinux.com/x/websocket v0.0.1 h1:OBc21DxqsGlQ2+Pz76xqLyDNo1LV+PUUqfWi+1PZPDE= shylinux.com/x/websocket v0.0.1/go.mod h1:AaSpMToOxbMULKQytzczeHPuqb708vK1vrAzCxLo/XE=