From 3d4a17f3d74036947e3fa62467187367081fb0e2 Mon Sep 17 00:00:00 2001 From: shaoying Date: Fri, 26 Feb 2021 00:19:15 +0800 Subject: [PATCH] opt some --- etc/conf/bash_local.sh | 5 ++++- etc/miss.sh | 5 ++--- usr/publish/ice.bin | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) delete mode 120000 usr/publish/ice.bin diff --git a/etc/conf/bash_local.sh b/etc/conf/bash_local.sh index e44034fd..b1b5ef29 100644 --- a/etc/conf/bash_local.sh +++ b/etc/conf/bash_local.sh @@ -6,7 +6,7 @@ export LC_ALL=en_US.utf-8 export CTX_ROOT=${CTX_ROOT:=~/contexts} export GOROOT=$CTX_ROOT/usr/local/go -export PATH=$CTX_ROOT/bin:$CTX_ROOT/usr/local/bin:$GOROOT/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin +export PATH=$CTX_ROOT/bin:$CTX_ROOT/usr/local/bin:$GOROOT/bin:$GOBIN:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin if [ -f ~/.ish/plug.sh ] && source ~/.ish/plug.sh; then require conf.sh @@ -14,3 +14,6 @@ if [ -f ~/.ish/plug.sh ] && source ~/.ish/plug.sh; then ish_ctx_cli_prompt fi +ps aux |grep tmux &>/dev/null && return +ps aux |grep ice.bin &>/dev/null && return +cd $CTX_ROOT && source etc/miss.sh diff --git a/etc/miss.sh b/etc/miss.sh index bb2eb4c4..97df7512 100644 --- a/etc/miss.sh +++ b/etc/miss.sh @@ -4,8 +4,8 @@ require miss.sh 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 +ish_miss_create_link ~/.bash_local $PWD/etc/conf/bash_local.sh +[ "$PWD" = "$HOME" ] || ish_miss_create_link $HOME/.ish $PWD/.ish require misc/tmux/tmux.sh ish_ctx_dev_tmux_prepare @@ -37,5 +37,4 @@ require misc/vim/vim.sh ish_ctx_dev_vim_prepare make - ish_miss_prepare_session miss miss diff --git a/usr/publish/ice.bin b/usr/publish/ice.bin deleted file mode 120000 index c35801a6..00000000 --- a/usr/publish/ice.bin +++ /dev/null @@ -1 +0,0 @@ -../../bin/ice.bin \ No newline at end of file