diff --git a/Makefile b/Makefile index bc38637b..a75d5a5c 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,16 @@ export GOPROXY=https://goproxy.cn,direct export GOPRIVATE=shylinux.com,github.com export CGO_ENABLED=0 -all: +publish_ice = usr/publish/ice.$(shell go env GOOS).$(shell go env GOARCH) + +all: def @echo && date - [ -f src/version.go ] || echo "package main" > src/version.go - go build -v -o bin/ice.bin src/main.go src/version.go && chmod u+x bin/ice.bin && ./bin/ice.sh restart - cp bin/ice.bin usr/publish/ice.$(shell go env GOOS).$(shell go env GOARCH) + 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} + +def: + @ [ -f src/version.go ] || echo "package main" > src/version.go + @ [ -f src/binpack.go ] || echo "package main" > src/binpack.go ice: cat src/binpack.go|sed 's/package main/package ice/g' > usr/release/binpack.go diff --git a/go.mod b/go.mod index 7e68d15f..c26fb3e1 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module shylinux.com/x/contexts go 1.11 -require shylinux.com/x/ice v0.6.8 +require shylinux.com/x/ice v0.7.0 require ( shylinux.com/x/golang-story v0.3.4 @@ -11,3 +11,17 @@ require ( shylinux.com/x/nginx-story v0.3.5 shylinux.com/x/redis-story v0.3.5 ) + +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 +) diff --git a/go.sum b/go.sum index 70be3dd0..a59e0326 100644 --- a/go.sum +++ b/go.sum @@ -2,23 +2,5 @@ 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.4 h1:CuA83v0DYOCU2154fJbxL3MYVBcKC8tLeHtD9KGxrpA= -shylinux.com/x/golang-story v0.3.4/go.mod h1:amooUwiVB0wNa2z6OfP0b6CodXmf+gcVgFaVGbam+eY= -shylinux.com/x/ice v0.6.4/go.mod h1:ACiAFs34NCB5qgfjgby1RXWS5y9q7BJMqaiycdtR3MM= -shylinux.com/x/ice v0.6.8 h1:GWltC/1lWJ59FNEPvONgWp2WvS9PsTnFeHECHc+Z6uo= -shylinux.com/x/ice v0.6.8/go.mod h1:q3FMEC7vskJRiEHJPEWoArwaOzMO65ySDWzUkZsZ/0g= -shylinux.com/x/icebergs v0.9.3/go.mod h1:UmlnuYttB+5Lw0gnzMhyWP3Yp5ngwQ1zrlyKQxOxLqM= -shylinux.com/x/icebergs v0.9.6 h1:rr1Yy36gbODvNHNIMTCBN4yTGFyAHVtmut8ntbPYXfs= -shylinux.com/x/icebergs v0.9.6/go.mod h1:UmlnuYttB+5Lw0gnzMhyWP3Yp5ngwQ1zrlyKQxOxLqM= -shylinux.com/x/linux-story v0.3.3 h1:k6SPJxw2NjFXLwa3V9BB0asRS9NhqbCEeyrL5rXv8/g= -shylinux.com/x/linux-story v0.3.3/go.mod h1:+nRy944KnhJQo4lb6VAFJj8/TnpGqdFxHJR2s6DLOxw= -shylinux.com/x/mysql-story v0.3.5 h1:8ZjCPD9URGxnrrixNsbCIxyIy4+wv1ROKmBOrtyNCrg= -shylinux.com/x/mysql-story v0.3.5/go.mod h1:QAM6SVeKLTh9u50MXmfMDT1sXUp+oaSzaC03uBjnm0s= -shylinux.com/x/nginx-story v0.3.5 h1:PMyaOZCZ8zlzHtKHxEZhCeaxzQurLlTMfUzpLtU2y34= -shylinux.com/x/nginx-story v0.3.5/go.mod h1:yQHh93+PYd5yBMrxffJdnCBwLafAwqv9zzX3MLtd2MA= -shylinux.com/x/redis-story v0.3.5 h1:uBti7RdfeKbV8P8bpTOQpT1q8J/SeK9ZNqA/k546fq4= -shylinux.com/x/redis-story v0.3.5/go.mod h1:KU4bps4EePrpS6e6hAI/X6StC7P3NX/v0iZp27XwEaY= -shylinux.com/x/toolkits v0.4.9 h1:1RQR+XQQ5x2Jwga9LxGjOyrQ0AdzDhRIvdNSFbxfVBA= -shylinux.com/x/toolkits v0.4.9/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= diff --git a/src/main.shy b/src/main.shy index c498aff6..972b3e85 100644 --- a/src/main.shy +++ b/src/main.shy @@ -38,3 +38,5 @@ field "架构图" web.code.git.spide args `intshell` spark shell ` find . -name "*.css" -exec sed -i 's/: /:/g' {} + ` + +source hi/hi.shy