diff --git a/bin/ice.sh b/bin/ice.sh index 2d37458e..c6a41ab6 100755 --- a/bin/ice.sh +++ b/bin/ice.sh @@ -29,7 +29,7 @@ restart() { start() { prepare trap HUP hup && while true; do - date && bin/ice.bin $@ 2>$ctx_log && echo -e \"\n\nrestarting...\" && break + date && bin/ice.bin $@ 2>$ctx_log && break || echo -e \"\n\nrestarting...\" done } stop() { diff --git a/etc/conf/bash_local.sh b/etc/conf/bash_local.sh index b1b5ef29..e6a5778e 100644 --- a/etc/conf/bash_local.sh +++ b/etc/conf/bash_local.sh @@ -17,3 +17,4 @@ fi ps aux |grep tmux &>/dev/null && return ps aux |grep ice.bin &>/dev/null && return cd $CTX_ROOT && source etc/miss.sh +[ -f ~/.bash_local ] && source ~/.bash_local diff --git a/etc/miss.sh b/etc/miss.sh index ca6397dd..4ad3b6e1 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -1,6 +1,6 @@ #!/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 +[ -f $PWD/.ish/plug.sh ] || [ -f $HOME/.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 $HOME/.ish/plug.sh require miss.sh [ "$PWD" = "$HOME" ] || ish_miss_create_link $HOME/.ish $PWD/.ish @@ -13,12 +13,12 @@ ish_ctx_dev_tmux_prepare require misc/git/git.sh ish_ctx_dev_git_prepare -ish_miss_prepare_develop ish_miss_prepare_compile +ish_miss_prepare_develop ish_miss_prepare_install -ish_miss_prepare_intshell ish_miss_prepare_contexts +ish_miss_prepare_intshell ish_miss_prepare_icebergs ish_miss_prepare_toolkits ish_miss_prepare_volcanos @@ -39,3 +39,4 @@ require misc/vim/vim.sh ish_ctx_dev_vim_prepare ish_miss_prepare_session miss miss +