X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.profile;h=66fe2fa3fbf306f365d5452898b1d3e544e6e78d;hp=1f6b720860d1330c82bcbfd213f7d5204bcaa2a1;hb=95c6fd411d2c07565de22cb093306616b4ea8418;hpb=f74cdd5fbf0ead8d188607abce07297a9e352460

diff --git a/.profile b/.profile
index 1f6b720..66fe2fa 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
@@ -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,32 +174,30 @@ 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"
+   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="${debian_chroot:+($debian_chroot)}`/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
@@ -218,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
@@ -259,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