From 7c99b97d87326cfeffd8fc3e1212852cbbf4a0cc Mon Sep 17 00:00:00 2001 From: shylinux Date: Thu, 13 Jul 2023 15:02:19 +0800 Subject: [PATCH] opt some --- etc/init.shy | 2 +- go.mod | 27 ++++++++++++++++----------- src/main.go | 1 + src/webview.go | 5 ++--- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/etc/init.shy b/etc/init.shy index 3610b3fa..d2977729 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -25,7 +25,7 @@ binpack insert usr/node_modules/html2canvas/dist/html2canvas.min.js binpack insert usr/node_modules/bootstrap-icons/font/ binpack insert usr/local/export/ - binpack insert usr/icons/ + # binpack insert usr/icons/ ~web.chat.macos applications install "dream" web.dream icon "usr/icons/Mission Control.png" diff --git a/go.mod b/go.mod index 84d22ca2..e3085f72 100644 --- a/go.mod +++ b/go.mod @@ -2,22 +2,27 @@ 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 -// shylinux.com/x/webview => ./usr/webview -// ) +replace ( + shylinux.com/x/go-git/v5 => ./usr/go-git + shylinux.com/x/go-qrcode => ./usr/go-qrcode + shylinux.com/x/icons => ./usr/icons + shylinux.com/x/websocket => ./usr/websocket + shylinux.com/x/webview => ./usr/webview +) -// 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.3.5 shylinux.com/x/icebergs v1.5.13 shylinux.com/x/toolkits v0.7.7 +) + +require ( + shylinux.com/x/icons v0.0.1 shylinux.com/x/webview v0.0.2 ) diff --git a/src/main.go b/src/main.go index 32b440e2..1b4df530 100644 --- a/src/main.go +++ b/src/main.go @@ -6,6 +6,7 @@ import ( _ "shylinux.com/x/icebergs/misc/chrome" _ "shylinux.com/x/icebergs/misc/java" _ "shylinux.com/x/icebergs/misc/node" + _ "shylinux.com/x/icons" ) func main() { print(ice.Run()) } diff --git a/src/webview.go b/src/webview.go index 2dd84595..8888d3d4 100644 --- a/src/webview.go +++ b/src/webview.go @@ -4,19 +4,18 @@ import ( "os" "shylinux.com/x/ice" - "shylinux.com/x/icebergs/base/tcp" - "shylinux.com/x/icebergs/base/web" _ "shylinux.com/x/icebergs/misc/alpha" _ "shylinux.com/x/icebergs/misc/chrome" _ "shylinux.com/x/icebergs/misc/java" _ "shylinux.com/x/icebergs/misc/node" "shylinux.com/x/icebergs/misc/webview" + _ "shylinux.com/x/icons" kit "shylinux.com/x/toolkits" ) func main() { os.Chdir(kit.HomePath(ice.CONTEXTS)) - go ice.Run(web.SERVE, tcp.START) + go ice.Run(ice.SERVE, ice.START) defer ice.Pulse.Cmd(ice.EXIT) webview.Run(nil) }