X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.profile;h=f222e80f965b338391c866a1698fbd9d1002fd65;hp=965af5646a654accddc9c3c58e993bcd3e9b0b31;hb=b6d98d86be0c8cecf208beb0379ad1459aa13c60;hpb=146c62e58aa974d6c2f7012de21a59d5535834eb

diff --git a/.profile b/.profile
index 965af56..f222e80 100644
--- a/.profile
+++ b/.profile
@@ -2,19 +2,39 @@
 # $HOME/.profile (works with sh, ksh and bash)
 #
 
-case "$SHELL" in
-   */*csh) SHELL=/bin/bash
-   ;;
-   # this is for bash.exe
-   *command.com | \
-      *\\bash) SHELL=//c/ubin/bash
-   ;;
-esac
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+if test -n "$BASH_VERSION"; then
+   case "$SHELL" in
+      */bash) ;;
+      */*csh) SHELL=/bin/bash ;;
+      # this is for bash.exe
+      *command.com | *\\bash) SHELL=//c/ubin/bash ;;
+   esac
+#elif test -n "$KSH_VERSION"; then
+#   ksh93
+#elif test -n "$FCEDIT"; then
+#   ksh88
+#elif test -n "$ZSH_VERSION"; then
+#   zsh
+#elif test -n "$PS3"; then
+#   unknown
+#else
+#   sh
+fi
 
 if [ -z "$USER" ]; then
    USER="$LOGNAME"; export USER
 fi
 
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
 ### umask sets a mask for the default file permissions,
 ### umask 022 is less restrictive, 077 more paranoid
 umask 077
@@ -85,7 +105,7 @@ if [ -t 0 ] ; then
 
    if [ -n "$HAS_LESS" ]; then
       PAGER=less
-      LESS="FRXgimq"
+      LESS="Rgimq"
       case "$LC_CTYPE" in
          *UTF-8) LESSCHARSET=utf-8
          ;;
@@ -97,20 +117,23 @@ if [ -t 0 ] ; then
       LESSEDIT='vim ?lt+%lt. -- %f'
       export LESS LESSCHARSET LESSEDIT # LESSCHARDEF
 
+      # make less more friendly for non-text input files, see lesspipe(1)
+      #[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
    else
       PAGER=more
    fi
    export PAGER
 
    EDITOR="$HOME"/.vim/vim.sh
-   VISUAL="$EDITOR"
    FCEDIT="$EDITOR"
-   export EDITOR VISUAL FCEDIT
+   VISUAL="$EDITOR"
+   export EDITOR FCEDIT VISUAL
 
    HISTCONTROL=ignoreboth
    HISTIGNORE='&: *:x:X:[bf]g'
    HISTFILE="$HOME/.sh_history"
-   HISTFILESIZE=1000
+   HISTFILESIZE=2000
    HISTSIZE=1000
    export HISTCONTROL HISTIGNORE HISTFILE HISTFILESIZE HISTSIZE
 
@@ -146,33 +169,35 @@ if [ -t 0 ] ; then
    ENV="$HOME/.shellrc"
    export ENV
 
-   case "$SHELL" in
-      */bash)
-         shopt -s checkwinsize
-         # display the user, host and current working directory
-         # in the terminal title
-         case "$TERM" in
-            *rxvt*|screen*|*term*|vt100)
-               OPS1="\[\033]0;\u@\h:\w\007\]"
-               case "$TERM" in
-                  screen*)
-                     OPS1=${OPS1}"\[\033k\u@\h:\w\033\\\]" # Set screen/tmux caption
-                  ;;
-               esac
-            ;;
-
-            *)
-               OPS1=""
-            ;;
-         esac
-
-         OPS1=${OPS1}"\u@\h \W "
-         . "$ENV"
+   # set variable identifying the chroot you work in (used in the prompt below)
+   if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+       debian_chroot="`cat /etc/debian_chroot`"
+   fi
+
+   if test -n "$BASH_VERSION"; then
+      # display the user, host and current working directory
+      # in the terminal title
+      case "$TERM" in
+         *rxvt*|screen*|*term*|vt100)
+            OPS1="\[\033]0;${debian_chroot:+($debian_chroot)}\u@\h:\w\007\]"
+            case "$TERM" in
+               screen*)
+                  OPS1=${OPS1}"\[\033k${debian_chroot:+($debian_chroot)}\u@\h:\w\033\\\\\]" # Set screen/tmux caption
+               ;;
+            esac
          ;;
-      *)
-         OPS1="`/usr/bin/whoami`@`/bin/hostname -s` "
+
+         *)
+            OPS1=""
          ;;
-   esac
+      esac
+
+      OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W "
+      . "$ENV"
+
+   else
+      OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` "
+   fi
 
    #PROMPT_DIRTRIM=2
    export OPS1 # PROMPT_DIRTRIM
@@ -201,9 +226,9 @@ if [ -t 0 ] ; then
 
    unset name email
 
-   if test -f .hushlogin && ! cmp -s .motd /etc/motd; then
-      tee $HOME/.motd < /etc/motd
-   fi
+   #if test -f .hushlogin && ! cmp -s .motd /etc/motd; then
+   #   tee $HOME/.motd < /etc/motd
+   #fi
 fi
 
 # No need to set DISPLAY - ssh sets DISPLAY and calls xauth
@@ -242,6 +267,8 @@ if [ -n "$DISPLAY" ]; then
    # nVidia OpenGL full scene anti-aliasing
    #__GL_FSAA_MODE=4
    #export __GL_FSAA_MODE
+
+   #xhost +local:root > /dev/null 2>&1
 fi
 
 [ -n "$HAS_LESS" ] && unset HAS_LESS