diff --git a/bin/ice.sh b/bin/ice.sh index 273d3650..2d37458e 100755 --- a/bin/ice.sh +++ b/bin/ice.sh @@ -29,7 +29,7 @@ restart() { start() { prepare trap HUP hup && while true; do - date && ice.bin $@ 2>$ctx_log && echo -e \"\n\nrestarting...\" && break + date && bin/ice.bin $@ 2>$ctx_log && echo -e \"\n\nrestarting...\" && break done } stop() { diff --git a/etc/conf/bash_local.sh b/etc/conf/bash_local.sh index 20178f6c..9dd3f14a 100644 --- a/etc/conf/bash_local.sh +++ b/etc/conf/bash_local.sh @@ -3,7 +3,7 @@ export CTX_ROOT=${CTX_ROOT:=~/contexts} export GOROOT=$CTX_ROOT/usr/local/go -export PATH=$CTX_ROOT/bin:$CTX_ROOT/usr/local/bin:$CTX_ROOT/usr/local/go/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin +export PATH=$CTX_ROOT/bin:$CTX_ROOT/usr/local/bin:$GOROOT/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin if [ -f ~/.ish/plug.sh ] && source ~/.ish/plug.sh; then require conf.sh diff --git a/etc/miss.sh b/etc/miss.sh index 2f3e4f0c..a26ccbb6 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -1,5 +1,4 @@ #!/bin/bash - [ -f ~/.ish/plug.sh ] || [ -f $PWD/.ish/plug.sh ] || git clone ${ISH_CONF_HUB_PROXY:="https://"}github.com/shylinux/intshell $PWD/.ish [ "$ISH_CONF_PRE" != "" ] || source $PWD/.ish/plug.sh || source ~/.ish/plug.sh require miss.sh @@ -8,6 +7,14 @@ ish_miss_create_link ~/.vim_local.vim $PWD/etc/conf/vim_local.vim ish_miss_create_link ~/.bashrc $PWD/etc/conf/bash_local.sh ish_miss_create_link ~/.ish $PWD/.ish +require misc/tmux/tmux.sh +require misc/git/git.sh +require misc/vim/vim.sh + +ish_ctx_dev_tmux_prepare +ish_ctx_dev_git_prepare +ish_ctx_dev_vim_prepare + ish_miss_prepare_develop ish_miss_prepare_compile ish_miss_prepare_install @@ -20,7 +27,7 @@ ish_miss_prepare_learning ish_miss_prepare_volcanos ish_miss_prepare wubi-dict -# ish_miss_prepare word-dict +ish_miss_prepare word-dict ish_miss_prepare linux-story ish_miss_prepare nginx-story @@ -28,13 +35,5 @@ ish_miss_prepare golang-story ish_miss_prepare redis-story ish_miss_prepare mysql-story -require misc/tmux/tmux.sh -require misc/git/git.sh -require misc/vim/vim.sh - -ish_ctx_dev_tmux_prepare -ish_ctx_dev_git_prepare -ish_ctx_dev_vim_prepare - make ish_miss_prepare_session miss miss diff --git a/src/main.shy b/src/main.shy index 8ede9cd9..73845218 100644 --- a/src/main.shy +++ b/src/main.shy @@ -1,4 +1,8 @@ title "contexts" +refer ` +官网 https://shylinux.com +源码 https://github.com/shylinux/contexts +` chapter "实践" label "实践" ` @@ -25,4 +29,3 @@ field "火山架" web.code.git.spide args `volcanos` field "冰山架" web.code.git.trend args `icebergs` field "冰山架" web.code.git.spide args `icebergs` -