From 311f9a676b521a4994a95fa98bba12ce62aa6b0e Mon Sep 17 00:00:00 2001 From: harveyshao Date: Sun, 13 Feb 2022 18:13:51 +0800 Subject: [PATCH] opt some --- Makefile | 2 +- go.mod | 16 +++++++++++++++- go.sum | 16 ---------------- src/debug/go.mod | 2 +- src/release/go.mod | 12 ++++++------ src/release/go.sum | 31 +++++++++++++++---------------- 6 files changed, 38 insertions(+), 41 deletions(-) diff --git a/Makefile b/Makefile index 91c023d5..bc38637b 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ all: @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) + cp bin/ice.bin usr/publish/ice.$(shell go env GOOS).$(shell go env GOARCH) 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 2aa89e5e..1f904371 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.4 +require shylinux.com/x/ice v0.6.6 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 72e48a1b..a59e0326 100644 --- a/go.sum +++ b/go.sum @@ -2,21 +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 h1:a2Xpo6loNhsHu6IwAmADHaOyA0PXfiaeQGH+LfDJtRw= -shylinux.com/x/ice v0.6.4/go.mod h1:ACiAFs34NCB5qgfjgby1RXWS5y9q7BJMqaiycdtR3MM= -shylinux.com/x/icebergs v0.9.3 h1:ZMjKP9R0n8lKN+MoJhRS9SrnUwt0TgHukuZ7bumGfgQ= -shylinux.com/x/icebergs v0.9.3/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/debug/go.mod b/src/debug/go.mod index 40d7f9b0..1f904371 100644 --- a/src/debug/go.mod +++ b/src/debug/go.mod @@ -2,7 +2,7 @@ module shylinux.com/x/contexts go 1.11 -require shylinux.com/x/ice v0.6.4 +require shylinux.com/x/ice v0.6.6 require ( shylinux.com/x/golang-story v0.3.4 diff --git a/src/release/go.mod b/src/release/go.mod index 01d74c72..d25a5087 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.6.3 +require shylinux.com/x/ice v0.6.6 require ( - shylinux.com/x/golang-story v0.3.2 - shylinux.com/x/linux-story v0.3.2 - shylinux.com/x/mysql-story v0.3.4 - shylinux.com/x/nginx-story v0.3.3 - shylinux.com/x/redis-story v0.3.4 + shylinux.com/x/golang-story v0.3.4 + shylinux.com/x/linux-story v0.3.3 + shylinux.com/x/mysql-story v0.3.5 + shylinux.com/x/nginx-story v0.3.5 + shylinux.com/x/redis-story v0.3.5 ) diff --git a/src/release/go.sum b/src/release/go.sum index 15994ada..7cadb9c1 100644 --- a/src/release/go.sum +++ b/src/release/go.sum @@ -2,23 +2,22 @@ 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.2 h1:VdreqBoZjdX/lOdRC1stdf7pK/Ev4c/E1CicB/R/27g= -shylinux.com/x/golang-story v0.3.2/go.mod h1:eKPeKU55WAYZitZ8CaikMy+Lyc6hS13FPB21zr1b/0o= -shylinux.com/x/ice v0.5.0/go.mod h1:1ZDB1T8fvcj45C/PK90hYka4hCTFMcnK6/rSH6yc+4I= -shylinux.com/x/ice v0.6.3 h1:uji71YSoHJ5jnoo1Au3Ds8VOU4NFK49NmY9/QM/lmPI= -shylinux.com/x/ice v0.6.3/go.mod h1:ACiAFs34NCB5qgfjgby1RXWS5y9q7BJMqaiycdtR3MM= -shylinux.com/x/icebergs v0.8.1/go.mod h1:xJflO+hAT3IdVHgVkODLT0hkolV5VQCohb9/PSecpoo= -shylinux.com/x/icebergs v0.9.3 h1:ZMjKP9R0n8lKN+MoJhRS9SrnUwt0TgHukuZ7bumGfgQ= +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.6 h1:Qscn0R/XSxZVauCZLylVaItaLzTjmIPWAtIMD87k9/E= +shylinux.com/x/ice v0.6.6/go.mod h1:j8gYCjaG+R1wRUbUvLu2hiOpFNJ+17rM5Yg4RE0Cf/Y= shylinux.com/x/icebergs v0.9.3/go.mod h1:UmlnuYttB+5Lw0gnzMhyWP3Yp5ngwQ1zrlyKQxOxLqM= -shylinux.com/x/linux-story v0.3.2 h1:CsOEhWP4exvmFtMccCA7Opyf15uYAa2GXAdpfoBRx+Q= -shylinux.com/x/linux-story v0.3.2/go.mod h1:ByfYNx1aLq/cA2KS8T0ftVnBWXjAageXZFdzXfOMhCk= -shylinux.com/x/mysql-story v0.3.4 h1:Kja7Y4Y2bJfcLUBJ90bS/3eVYenP3C8mc787gzx2qxA= -shylinux.com/x/mysql-story v0.3.4/go.mod h1:Qi5ti/W+pz5svut88xBGCnTF510RotD/HNVnZ5FmT+A= -shylinux.com/x/nginx-story v0.3.3 h1:Sv+38+9Iax3PS3p3CKMqkcHo5CAxQLtIkfkj77OHvHI= -shylinux.com/x/nginx-story v0.3.3/go.mod h1:PtPm8ebU+kn6IgOYgR+TnqjyuWq5yB/Feelp3/sjspk= -shylinux.com/x/redis-story v0.3.4 h1:DIUMYAs0dh1P7b2SfTaJxZGdvm2jTvtda4gr+CIA1+U= -shylinux.com/x/redis-story v0.3.4/go.mod h1:hrZcH86x1qrhfWbHe9RT52JcQtNpXCjP/twnVZ632u4= -shylinux.com/x/toolkits v0.4.6/go.mod h1:8LbYHe7oxBIqb6s4MSOD+4d28QvPdvkyCVtwB/JW7AA= +shylinux.com/x/icebergs v0.9.4 h1:ebXKavKVCbIN8gu2TpRCgkj9wI1XUR8KlWj5w4uaJRY= +shylinux.com/x/icebergs v0.9.4/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=