diff --git a/etc/conf/bash_local.sh b/etc/conf/bash_local.sh index fed5ab80..ecda5d97 100644 --- a/etc/conf/bash_local.sh +++ b/etc/conf/bash_local.sh @@ -6,16 +6,9 @@ export CTX_ROOT=${CTX_ROOT:=~/contexts} ish_sys_cli_prompt ish_sys_cli_alias vi vim ish_sys_cli_alias t "tmux attach" -ish_sys_path_insert $CTX_ROOT/usr/local/bin -ish_sys_path_insert $CTX_ROOT/usr/publish -ish_sys_path_insert $CTX_ROOT/bin ish_sys_path_insert $PWD/usr/publish ish_sys_path_insert $PWD/bin - -touch $CTX_ROOT/etc/path -for line in `cat $CTX_ROOT/etc/path`; do - ish_sys_path_insert $line -done +ish_sys_path_load ps aux |grep -v grep |grep ice.bin &>/dev/null && return ps aux |grep -v grep |grep tmux &>/dev/null && return diff --git a/etc/conf/vim_local.vim b/etc/conf/vim_local.vim index 990d3900..1c30d4de 100644 --- a/etc/conf/vim_local.vim +++ b/etc/conf/vim_local.vim @@ -1,6 +1,5 @@ inoremap jk -inoremap kj cnoremap wa wa set path+=.,..,./usr/,./usr/volcanos/,./usr/icebergs/,.ish/pluged/,~/.ish/pluged/,$GOROOT/src,/usr/include diff --git a/etc/miss.sh b/etc/miss.sh index 8f3eb84f..c8617ee5 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -6,6 +6,8 @@ if [ "$ISH_CONF_PRE" = "" ]; then 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 @@ -31,7 +33,9 @@ ish_miss_prepare_toolkits ish_miss_prepare_volcanos ish_miss_prepare_learning -make +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 ish_sys_link_create ~/.vim_local.vim $PWD/etc/conf/vim_local.vim require dev/vim/vim.sh diff --git a/src/main.go b/src/main.go index d570ed19..b02f737c 100644 --- a/src/main.go +++ b/src/main.go @@ -29,12 +29,11 @@ import ( _ "shylinux.com/x/linux-story/src/gdb" _ "shylinux.com/x/linux-story/src/glibc" + _ "shylinux.com/x/linux-story/cli" + _ "shylinux.com/x/linux-story/iso/centos" _ "shylinux.com/x/linux-story/src/busybox" _ "shylinux.com/x/linux-story/src/kernel" _ "shylinux.com/x/linux-story/src/qemu" - - _ "shylinux.com/x/linux-story/cli" - _ "shylinux.com/x/linux-story/iso/centos" ) func main() { print(ice.Run()) }