diff --git a/Makefile b/Makefile index a75d5a5c..c018bc96 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -export GOPROXY=https://goproxy.cn,direct -export GOPRIVATE=shylinux.com,github.com export CGO_ENABLED=0 publish_ice = usr/publish/ice.$(shell go env GOOS).$(shell go env GOARCH) @@ -13,9 +11,6 @@ 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 - app: CGO_ENABLED=1 go build -o usr/publish/contexts.app/Contents/MacOS/contexts src/app.go src/binpack.go && open usr/publish/contexts.app hdiutil create usr/publish/tmp.dmg -ov -volname "ContextsInstall" -fs HFS+ -srcfolder "usr/publish/contexts.app" diff --git a/etc/init.shy b/etc/init.shy index 12cb2735..761be79e 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -8,6 +8,7 @@ role white void web.wiki.draw ~web.code.input + # wubi import file usr/wubi-dict/wubi86 wubi import file usr/wubi-dict/person zone person ~gdb diff --git a/go.mod b/go.mod index c0be6fe2..11af1b10 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.8.4 +require shylinux.com/x/ice v0.8.5 require ( shylinux.com/x/golang-story v0.3.6 diff --git a/src/debug/go.mod b/src/debug/go.mod index c0be6fe2..11af1b10 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.8.4 +require shylinux.com/x/ice v0.8.5 require ( shylinux.com/x/golang-story v0.3.6 diff --git a/src/main.go b/src/main.go index 1da55516..a2ff5029 100644 --- a/src/main.go +++ b/src/main.go @@ -2,7 +2,7 @@ package main import ( _ "shylinux.com/x/contexts/src/hi" - + "shylinux.com/x/ice" _ "shylinux.com/x/icebergs/misc/alpha"