浏览代码

bashrc, profile: fix PATH configs

pull/1/head
10sr 11 年前
父节点
当前提交
797f90453e
共有 2 个文件被更改,包括 44 次插入36 次删除
  1. +43
    -3
      bashrc
  2. +1
    -33
      profile

+ 43
- 3
bashrc 查看文件

@@ -46,11 +46,38 @@ fi

#################################

if echo $PATH | grep "$HOME" >/dev/null 2>&1
__search_string(){
# __search_string str1 str2
# return 0 if str2 is found in str1
expr "$1" : ".*$2.*" >/dev/null
}

if ! __search_string "$PATH" "$HOME/.local/bin"
then
PATH="${PATH}:${HOME}/.local/bin:$HOME/.local/lib/gems/bin"
fi

if ismsys && ! __search_string "$PATH" /c/mingw/bin
then
PATH="$PATH:/c/mingw/bin:/c/mingw/msys/1.0/bin"
fi

# # it is not so good
# # http://archive.linux.or.jp/JF/JFdocs/Program-Library-HOWTO/shared-libraries.html
# # http://superuser.com/questions/324613/installing-a-library-locally-in-home-directory-but-program-doesnt-recognize-it
# without this ENV i cannot run tmux. another way is to use --disable-shared
# when building tmux
if ! __search_string "$LD_LIBRARY_PATH" "$HOME/.local/lib"
then
PATH="${PATH}:${HOME}/.local/bin"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/.local/lib"
fi

##################################

export TERMCAP="${TERMCAP}:vb="
ismsys && export HOSTNAME
export ENV=~/.shrc

if false iswindows
then
export PAGER='tr -d \\r | less'
@@ -84,7 +111,20 @@ then
TERM=screen-256color
fi

test -z "$TMP" && export TMP=/tmp/${USER}-tmp
if test -z "$TMP"
then
if test -n "$TMPDIR"
then
export TMP=$TMPDIR
elif test -n "$TEMP"
then
export TMP="$TEMP"
else
export TMP=/tmp
fi
fi
export TMP="${TMP}/${USER}-tmp"
export TEMP="$TMP"
mkdir -p "$TMP"

! iswindows && null type stty && {


+ 1
- 33
profile 查看文件

@@ -19,9 +19,6 @@

# export PS1="\$ "
export LC_TIME=C
export TERMCAP="${TERMCAP}:vb="
export HOSTNAME
export ENV=~/.shrc

mkdir -p $HOME/.local/lib/python/site-packages
export PYTHONDOCS=/usr/share/doc/python/html/
@@ -35,39 +32,10 @@ export GEM_HOME="$HOME/.local/lib/gems"
export PATH="$PATH:$HOME/.local/lib/gems/bin"
export RUBYLIB="$RUBYLIB:$HOME/.local/lib/gems/lib"

__add_to_path(){
for p in "$@"
do
echo $PATH | grep -E "^$p:|:$p:|:$p$" >/dev/null 2>&1 || \
PATH="$p:${PATH}"
done
}
# export PATH="${PATH}:${HOME}/bin"
__add_to_path ${HOME}/.local/bin /c/mingw/bin /c/mingw/msys/1.0/bin

# # it is not so good
# # http://archive.linux.or.jp/JF/JFdocs/Program-Library-HOWTO/shared-libraries.html
# # http://superuser.com/questions/324613/installing-a-library-locally-in-home-directory-but-program-doesnt-recognize-it
# without this ENV i cannot run tmux. another way is to use --disable-shared
# when building tmux
export LD_LIBRARY_PATH="$HOME/.local/lib:$LD_LIBRARY_PATH"
# this should be used when ./configure
#export CFLAGS="$CFLAGS -I$HOME/.local/include"

#_python_pkg_conf="/opt/local/Library/Frameworks/Python.framework/Versions/2.7/lib/pkgconfig"
export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$_python_pkg_conf"

export MANPATH="$MANPATH:$HOME/.local/share/man"

type setterm >/dev/null 2>&1 && setterm -blank 30 -powersave on # -powerdown 10
# in my environment powerdown does not work

if test -n "$TMPDIR"
then
export TMP=$TMPDIR
else
export TMP=/tmp/
fi
export TMP="${TMP}${USER}-tmp"
export TEMP="$TMP"
mkdir -p "$TMP"
type setterm >/dev/null 2>&1 && setterm -blank 30 -powersave on # -powerdown 10

正在加载...
取消
保存