X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.profile;h=0e3ffdd34fb2e413fa64487bb00306e04914b6b7;hb=60a70cfee8af5e2da611e7ad91fd86db9bb8ea81;hp=4b7368a84e5bdd4e0d67968ce39c689407083d2e;hpb=3feb230e5fad6fe3b98899795864e81995ce8692;p=dotfiles.git diff --git a/.profile b/.profile index 4b7368a..0e3ffdd 100644 --- a/.profile +++ b/.profile @@ -60,18 +60,22 @@ if [ -t 0 ] ; then stty sane erase ^H + if [ -n "`which less 2>/dev/null`" ]; then + HAS_LESS=true + fi + case "$TERM" in linux) # mutt, python and vim BACKGROUND=DARK export BACKGROUND - . "$HOME"/lib/config/less/dark_bg + [ -n "$HAS_LESS" ] && . "$HOME"/lib/config/less/dark_bg ;; *rxvt*|screen*|*term*|vt100) BACKGROUND=LIGHT export BACKGROUND - . "$HOME"/lib/config/less/light_bg + [ -n "$HAS_LESS" ] && . "$HOME"/lib/config/less/light_bg ;; esac @@ -79,18 +83,24 @@ if [ -t 0 ] ; then test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)" fi - PAGER=less - LESS="FRXgimq" - case "$LC_CTYPE" in - *UTF-8) LESSCHARSET=utf-8 - ;; + if [ -n "$HAS_LESS" ]; then + PAGER=less + LESS="Rgimq" + case "$LC_CTYPE" in + *UTF-8) LESSCHARSET=utf-8 + ;; - *) LESSCHARSET=koi8-r - ;; - esac - #LESSCHARDEF=32c. - LESSEDIT='vim ?lt+%lt. -- %f' - export PAGER LESS LESSCHARSET LESSEDIT # LESSCHARDEF + *) LESSCHARSET=koi8-r + ;; + esac + #LESSCHARDEF=32c. + LESSEDIT='vim ?lt+%lt. -- %f' + export LESS LESSCHARSET LESSEDIT # LESSCHARDEF + + else + PAGER=more + fi + export PAGER EDITOR="$HOME"/.vim/vim.sh VISUAL="$EDITOR" @@ -146,7 +156,7 @@ if [ -t 0 ] ; then OPS1="\[\033]0;\u@\h:\w\007\]" case "$TERM" in screen*) - OPS1+"\[\033k\u@\h:\w\033\\\]" # Set screen/tmux caption + OPS1=${OPS1}"\[\033k\u@\h:\w\033\\\\\]" # Set screen/tmux caption ;; esac ;; @@ -156,7 +166,7 @@ if [ -t 0 ] ; then ;; esac - OPS1+="\u@\h \W " + OPS1=${OPS1}"\u@\h \W " . "$ENV" ;; *) @@ -204,7 +214,7 @@ if [ -n "$DISPLAY" ]; then # mutt, python and vim BACKGROUND=LIGHT export BACKGROUND - . "$HOME"/lib/config/less/light_bg + [ -n "$HAS_LESS" ] && . "$HOME"/lib/config/less/light_bg # BROWSERs BROWSER="firefox:seamonkey:chromium:google-chrome:opera:xlinks2:$BROWSER" @@ -234,6 +244,8 @@ if [ -n "$DISPLAY" ]; then #export __GL_FSAA_MODE fi +[ -n "$HAS_LESS" ] && unset HAS_LESS + # # read in usepkg function # . "$HOME"/lib/config/usepkg.sh