From 74105e75bf30550a124ead88e4c0f913521d2837 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Tue, 18 Jun 2013 16:49:18 +0900 Subject: [PATCH 1/3] fixes for windows --- bashrc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bashrc b/bashrc index 0e62117..46e66ec 100755 --- a/bashrc +++ b/bashrc @@ -266,7 +266,6 @@ if iscygwin; then null type windate || \ alias windate="/c/Windows/System32/cmd.exe //c 'echo %DATE%-%TIME%'" alias cygsu="cygstart /cygwinsetup.exe" - alias emacs="CYGWIN=tty emacs -nw" alias ls="ls -CFG $(iswindows || test "$TERM" = dumb || echo --color=auto)" fi @@ -318,10 +317,10 @@ s(){ if git rev-parse --git-dir >/dev/null 2>&1 then git grep -n "$@" - elif which ag >/dev/null + elif which ag >/dev/null 2>&1 then ag --pager="$PAGER" "$@" - elif which ack >/dev/null + elif which ack >/dev/null 2>&1 then ack --pager="$PAGER" "$@" else From 9e02f72fb117f2b73641da03040456f753bc9772 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Fri, 21 Jun 2013 10:26:16 +0900 Subject: [PATCH 2/3] bashrc: modify for cygwin --- bashrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bashrc b/bashrc index 46e66ec..79dfca4 100755 --- a/bashrc +++ b/bashrc @@ -264,9 +264,9 @@ null type port && { if iscygwin; then null type windate || \ - alias windate="/c/Windows/System32/cmd.exe //c 'echo %DATE%-%TIME%'" - alias cygsu="cygstart /cygwinsetup.exe" - alias ls="ls -CFG $(iswindows || test "$TERM" = dumb || echo --color=auto)" + alias windate="cmd.exe //c 'echo %DATE%-%TIME%'" + # alias cygsu="cygstart /cygwinsetup.exe" + # alias ls="ls -CFG $(iswindows || test "$TERM" = dumb || echo --color=auto)" fi g(){ From 797f90453ec6e97b3f0d8bdfa1849c41915ce441 Mon Sep 17 00:00:00 2001 From: 10sr <8slashes+git@gmail.com> Date: Wed, 26 Jun 2013 15:27:09 +0900 Subject: [PATCH 3/3] bashrc, profile: fix PATH configs --- bashrc | 46 +++++++++++++++++++++++++++++++++++++++++++--- profile | 34 +--------------------------------- 2 files changed, 44 insertions(+), 36 deletions(-) diff --git a/bashrc b/bashrc index b9e1284..9ffa1cc 100755 --- a/bashrc +++ b/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 && { diff --git a/profile b/profile index 9179c3f..4cd8f3c 100755 --- a/profile +++ b/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