From f310949291bfef728471a9674f7001402d562cf2 Mon Sep 17 00:00:00 2001 From: shylinux Date: Sun, 21 Aug 2022 15:56:52 +0800 Subject: [PATCH] opt some --- Makefile | 14 +++++++------- etc/exit.shy | 3 ++- etc/init.shy | 5 ++++- etc/miss.sh | 16 +++++++--------- src/package-lock.json | 11 +++++++++++ src/package.json | 1 + 6 files changed, 32 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index dd2236fb..f7cd2b10 100644 --- a/Makefile +++ b/Makefile @@ -1,19 +1,13 @@ export CGO_ENABLED=0 -publish = 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 ${binarys} src/main.go src/version.go src/binpack.go && ./${binarys} forever restart &>/dev/null mkdir -p $(dir ${publish}) &>/dev/null; rm ${publish} &>/dev/null; cp ${binarys} ${publish} -mipsle: - GOOS=linux GOARCH=mipsle go build -o usr/publish/ice.linux.mipsle src/main.go src/version.go src/binpack.go - -arm: - GOOS=linux GOARCH=arm go build -o usr/publish/ice.linux.arm src/main.go src/version.go src/binpack.go - def: @ [ -f src/version.go ] || echo "package main" > src/version.go @ [ -f src/binpack.go ] || echo "package main" > src/binpack.go @@ -24,6 +18,12 @@ app: # rm -f usr/publish/ContextsInstall.dmg # hdiutil convert usr/publish/tmp.dmg -format UDZO -o usr/publish/ContextsInstall.dmg +arm: + GOOS=linux GOARCH=arm go build -o usr/publish/ice.linux.arm src/main.go src/version.go src/binpack.go + +mipsle: + GOOS=linux GOARCH=mipsle go build -o usr/publish/ice.linux.mipsle src/main.go src/version.go src/binpack.go + %: src/%.go @echo && date go build -v -o usr/publish/$@ src/$@.go && chmod u+x usr/publish/$@ diff --git a/etc/exit.shy b/etc/exit.shy index 570b0038..f7bb4394 100644 --- a/etc/exit.shy +++ b/etc/exit.shy @@ -1 +1,2 @@ -~aaa +~cli + daemon export diff --git a/etc/init.shy b/etc/init.shy index ce0175ce..6ece25f9 100644 --- a/etc/init.shy +++ b/etc/init.shy @@ -1,3 +1,6 @@ +~cli + daemon import + ~aaa role white void web.code.git.spide role white void web.code.git.trend @@ -27,6 +30,6 @@ event action listen event dream.create cmd web.code.tmux.session ~ssh - target web.code target web.chat + target web.code source local.shy diff --git a/etc/miss.sh b/etc/miss.sh index 2b5e9bce..94b32c2c 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -7,13 +7,10 @@ fi require sys/cli/file.sh ish_sys_path_load -[ -f ~/.bash_profile ] || echo "source ~/.bashrc" >> ~/.bash_profile -ish_sys_link_create ~/.bash_local $PWD/etc/conf/bash_local.sh - require miss.sh ish_miss_prepare_compile ish_miss_prepare_develop -ish_miss_prepare_install +ish_miss_prepare_operate # ish_miss_prepare word-dict # ish_miss_prepare wubi-dict @@ -23,26 +20,27 @@ ish_miss_prepare nginx-story ish_miss_prepare golang-story ish_miss_prepare redis-story ish_miss_prepare mysql-story - ish_miss_prepare release -ish_miss_prepare_contexts + ish_miss_prepare_intshell +ish_miss_prepare_contexts ish_miss_prepare_icebergs ish_miss_prepare_toolkits ish_miss_prepare_volcanos ish_miss_prepare_learning -ish_miss_make; if [ -n "$*" ]; then ./bin/ice.bin forever serve "$@"; fi +ish_miss_make; if [ -n "$*" ]; then ish_miss_serve "$@"; fi +ish_sys_link_create ~/.bash_local $PWD/etc/conf/bash_local.sh ish_sys_link_create ~/.vim_local.vim $PWD/etc/conf/vim_local.vim require dev/vim/vim.sh -# ish_dev_vim_prepare +ish_dev_vim_prepare if tmux -V; then require dev/tmux/tmux.sh ish_dev_tmux_prepare ish_miss_prepare_session miss miss else - ctx_log=/dev/stdout ish_miss_serve + ish_miss_serve_log fi diff --git a/src/package-lock.json b/src/package-lock.json index 5e635418..f40b73d6 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -5,11 +5,17 @@ "packages": { "": { "dependencies": { + "gifshot": "^0.4.5", "xterm": "^4.19.0", "xterm-addon-fit": "^0.5.0", "xterm-addon-web-links": "^0.6.0" } }, + "node_modules/gifshot": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/gifshot/-/gifshot-0.4.5.tgz", + "integrity": "sha512-oaOTT7patjxFFv7ptR0R0NNhqy3ZAmcLUQCjM/sTsvsQaUAlB2fHirLajcNAKJ6ufoVhdP+ZkXYvmUycHP1FNg==" + }, "node_modules/xterm": { "version": "4.19.0", "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.19.0.tgz", @@ -33,6 +39,11 @@ } }, "dependencies": { + "gifshot": { + "version": "0.4.5", + "resolved": "https://registry.npmjs.org/gifshot/-/gifshot-0.4.5.tgz", + "integrity": "sha512-oaOTT7patjxFFv7ptR0R0NNhqy3ZAmcLUQCjM/sTsvsQaUAlB2fHirLajcNAKJ6ufoVhdP+ZkXYvmUycHP1FNg==" + }, "xterm": { "version": "4.19.0", "resolved": "https://registry.npmjs.org/xterm/-/xterm-4.19.0.tgz", diff --git a/src/package.json b/src/package.json index 739a1fa5..fec16a04 100644 --- a/src/package.json +++ b/src/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "gifshot": "^0.4.5", "xterm": "^4.19.0", "xterm-addon-fit": "^0.5.0", "xterm-addon-web-links": "^0.6.0"