diff --git a/README.txt b/README.txt index 04c9f13..31a58d7 100644 --- a/README.txt +++ b/README.txt @@ -73,12 +73,14 @@ explicitly by $HOME/.profile . Source $HOME/.shrc . $HOME/{.bash_profile,.zprofile} <= login with bash/zsh | `--$HOME/.profile <= login with sh - | | - | `--$HOME/.{ba,z}shrc <= bash, zsh - | | - `----`--$HOME/.shrc <= sh - | - `--$HOME/.dotfiles/shrc + | | + | `--$HOME/.dotfiles/profile + | + | $HOME/.{ba,z}shrc <= bash, zsh + | | + `--`--$HOME/.shrc <= sh (by EnvVal ENV) + | + `--$HOME/.dotfiles/shrc ~/.xinitrc <= startx | diff --git a/profile b/profile new file mode 100755 index 0000000..679d283 --- /dev/null +++ b/profile @@ -0,0 +1,117 @@ +#!/bin/sh + +# profile --- 10sr profile + +__safe_add_path_r(){ + # add path to right + test -d "$1" && PATH="${PATH}:$1" +} +__safe_add_path_l(){ + # add path to left + test -d "$1" && PATH="$1:${PATH}" +} + +__safe_add_path_l "$HOME/.cabal/bin" +__safe_add_path_l "$HOME/.local/lib/gems/bin" + __safe_add_path_l "$HOME/.local/bin" +__safe_add_path_l "$HOME/.gem/ruby/2.1.0/bin" +__safe_add_path_r "/c/mingw/bin" +__safe_add_path_r "/c/mingw/msys/1.0/bin" + +# macports coreutils +# $isdarwin cannot be used it is not defined yet +__safe_add_path_l "/opt/local/bin" +__safe_add_path_l "/opt/local/sbin" +__safe_add_path_l "/opt/local/libexec/gnubin" +__safe_add_path_l \ + "/opt/local/Library/Frameworks/Python.framework/Versions/3.2/bin" + +test -f "${__dotdir}/rc.py" && export PYTHONSTARTUP="${__dotdir}/rc.py" + +test -d "$HOME/.local/lib/python/site-packages" && \ + export PYTHONPATH="${PYTHONPATH}:${HOME}/.local/lib/python/site-packages" + +export GEM_HOME="$HOME/.local/lib/gems" +export RUBYLIB="$RUBYLIB:$HOME/.local/lib/gems/lib" + + +# 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 ! __match "$LD_LIBRARY_PATH" "$HOME/.local/lib" +then + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/.local/lib" +fi + +# in my environment powerdown does not work +test -z "$DISPLAY" && test -z "$SSH_CONNECTION" && \ + type setterm >/dev/null 2>&1 && \ + setterm -blank 30 -powersave on # -powerdown 10 + +################################## +# EnvVal definitions + +test "$TERM" = linux && export LANG=C +export LC_MESSAGES=C +export LC_TIME=C + +export TERMCAP="${TERMCAP}:vb=" +# export ENV=~/.shrc + +export PAGER="less" +export LESS="-iRMX" + +# Style for lesspipe is defined in esc.style +_src_hilite_lp_path="`command -v src-hilite-lesspipe.sh 2>/dev/null`" +for f in /usr/share/source-highlight/src-hilite-lesspipe.sh +do + test -z "$_src_hilite_lp_path" && test -e "$f" && _src_hilite_lp_path="$f" +done +test -n "$_src_hilite_lp_path" && export LESSOPEN="| $_src_hilite_lp_path %s" + +if null type vim +then + export EDITOR=vim +else + export EDITOR=vi +fi +# export CDPATH=".:~" +export VISUAL="$EDITOR" + +export GIT_PAGER="less -F" +export GIT_EDITOR="$EDITOR" +export GIT_MERGE_AUTOEDIT=no + +if test -n "$TMUX" && \ + __match $TERM screen && \ + __match `tmux display -p '#{client_termname}'` 256color +then + TERM=screen-256color +fi + +# set TMP, TEMP, TMPDIR + +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 +__match "$TMP" "${USER}-tmp" >/dev/null || TMP="${TMP}/${USER}-tmp" +test -d "$TMP" || mkdir -p "$TMP" +export TEMP=$TMP +export TMPDIR=$TMP + +if test -d ~/dbx +then + export CHIT_PATH="$HOME/dbx/.chit" +fi + diff --git a/shrc b/shrc index d63d9a6..b6d9f09 100755 --- a/shrc +++ b/shrc @@ -57,129 +57,6 @@ then __shrc="$0" fi -################################# -# profile-like setups - -__safe_add_path_r(){ - # add path to right - test -d "$1" && PATH="${PATH}:$1" -} -__safe_add_path_l(){ - # add path to left - test -d "$1" && PATH="$1:${PATH}" -} - -__safe_add_path_l "$HOME/.cabal/bin" -__safe_add_path_l "$HOME/.local/lib/gems/bin" -# __safe_add_path_l "$HOME/.local/bin" -__safe_add_path_l "$HOME/.gem/ruby/2.1.0/bin" -__safe_add_path_r "/c/mingw/bin" -__safe_add_path_r "/c/mingw/msys/1.0/bin" - -# macports coreutils -# $isdarwin cannot be used it is not defined yet -__safe_add_path_l "/opt/local/bin" -__safe_add_path_l "/opt/local/sbin" -__safe_add_path_l "/opt/local/libexec/gnubin" -__safe_add_path_l \ - "/opt/local/Library/Frameworks/Python.framework/Versions/3.2/bin" - -test -f "${__dotdir}/rc.py" && export PYTHONSTARTUP="${__dotdir}/rc.py" - -test -d "$HOME/.local/lib/python/site-packages" && \ - export PYTHONPATH="${PYTHONPATH}:${HOME}/.local/lib/python/site-packages" - -export GEM_HOME="$HOME/.local/lib/gems" -export RUBYLIB="$RUBYLIB:$HOME/.local/lib/gems/lib" - - -# 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 ! __match "$LD_LIBRARY_PATH" "$HOME/.local/lib" -then - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/.local/lib" -fi - -# in my environment powerdown does not work -test -z "$DISPLAY" && test -z "$SSH_CONNECTION" && \ - type setterm >/dev/null 2>&1 && \ - setterm -blank 30 -powersave on # -powerdown 10 - -################################## -# EnvVal definitions - -test "$TERM" = linux && export LANG=C -export LC_MESSAGES=C -export LC_TIME=C - -export TERMCAP="${TERMCAP}:vb=" -# export ENV=~/.shrc - -export PAGER="less" -export LESS="-iRMX" - -# Style for lesspipe is defined in esc.style -_src_hilite_lp_path="`command -v src-hilite-lesspipe.sh 2>/dev/null`" -for f in /usr/share/source-highlight/src-hilite-lesspipe.sh -do - test -z "$_src_hilite_lp_path" && test -e "$f" && _src_hilite_lp_path="$f" -done -test -n "$_src_hilite_lp_path" && export LESSOPEN="| $_src_hilite_lp_path %s" - -if null type vim -then - export EDITOR=vim -else - export EDITOR=vi -fi -# export CDPATH=".:~" -export VISUAL="$EDITOR" - -export GIT_PAGER="less -F" -export GIT_EDITOR="$EDITOR" -export GIT_MERGE_AUTOEDIT=no - -if test -n "$TMUX" && \ - __match $TERM screen && \ - __match `tmux display -p '#{client_termname}'` 256color -then - TERM=screen-256color -fi - -# set TMP, TEMP, TMPDIR - -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 -__match "$TMP" "${USER}-tmp" >/dev/null || TMP="${TMP}/${USER}-tmp" -test -d "$TMP" || mkdir -p "$TMP" -export TEMP=$TMP -export TMPDIR=$TMP - -if test -d ~/dbx -then - export CHIT_PATH="$HOME/dbx/.chit" -fi - -# adhoc fix for ansible on cygwin -# http://blog.s-uni.net/2013/08/27/ansible-running-on-cygwin/ -if $incygwin -then - export ANSIBLE_SSH_ARGS="-o ControlMaster=no" -fi - ######################### # shrc.common # this variable must consistent with setup.sh @@ -200,6 +77,13 @@ then fi $ismsys && export HOSTNAME +# adhoc fix for ansible on cygwin +# http://blog.s-uni.net/2013/08/27/ansible-running-on-cygwin/ +if $iscygwin +then + export ANSIBLE_SSH_ARGS="-o ControlMaster=no" +fi + ########################## # Terminal setups