X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.profile;h=93756db412a213909724bf2161e1fc8cef555c53;hb=d48e73aef5910b860e0a744fc09d2664f5023df1;hp=1f6b720860d1330c82bcbfd213f7d5204bcaa2a1;hpb=f74cdd5fbf0ead8d188607abce07297a9e352460;p=dotfiles.git

diff --git a/.profile b/.profile
index 1f6b720..93756db 100644
--- a/.profile
+++ b/.profile
@@ -8,14 +8,24 @@
 # see /usr/share/doc/bash/examples/startup-files for examples.
 # the files are located in the bash-doc package.
 
-case "$SHELL" in
-   */*csh) SHELL=/bin/bash
-   ;;
-   # this is for bash.exe
-   *command.com | \
-      *\\bash) SHELL=//c/ubin/bash
-   ;;
-esac
+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
@@ -29,7 +39,7 @@ fi
 ### umask 022 is less restrictive, 077 more paranoid
 umask 077
 
-PATH="$HOME"/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+PATH="$HOME"/bin:"$HOME"/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 MANPATH="$HOME"/man:/usr/local/man:/usr/share/man:/usr/man
 # LD_LIBRARY_PATH=/usr/local/lib:/usr/lib:/lib
 export PATH MANPATH # LD_LIBRARY_PATH
@@ -70,7 +80,7 @@ if [ -t 0 ] ; then
 
    stty sane erase ^H
 
-   if [ -n "`which less 2>/dev/null`" ]; then
+   if which less >/dev/null 2>&1; then
       HAS_LESS=true
    fi
 
@@ -116,9 +126,9 @@ if [ -t 0 ] ; then
    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'
@@ -164,35 +174,20 @@ if [ -t 0 ] ; then
        debian_chroot="`cat /etc/debian_chroot`"
    fi
 
-   case "$SHELL" in
-      */bash)
-         # 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=""
-            ;;
-         esac
-
-         OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W "
-         . "$ENV"
-         ;;
-      *)
-         OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` "
-         ;;
-   esac
+   if test -n "$BASH_VERSION"; then
+      if [ -r "$HOME"/admin/prog/bash_prompt ]; then
+         . "$HOME"/admin/prog/bash_prompt
+         set_prompts
+         unset set_prompts
+      else
+         OPS1="${debian_chroot:+($debian_chroot)}\u@\h:\W \$SHLVL\\$ "
+      fi
+
+      . "$ENV"
 
-   #PROMPT_DIRTRIM=2
-   export OPS1 # PROMPT_DIRTRIM
+   else
+      OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` > "
+   fi
 
    ### biff controls new mail notification
    #biff n
@@ -218,9 +213,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
@@ -259,6 +254,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