.profile: Add `$SCREENDIR`

[dotfiles.git] / .profile

diff --git a/.profile b/.profile
index 9638bacc26711c76b19c9f07d50590aefe689c6b..4aa6cb369f8281cf816d9939fde30be034bfd56b 100644 (file)
--- a/.profile
+++ b/.profile
@@ -8,24 +8,19 @@
 # see /usr/share/doc/bash/examples/startup-files for examples.
 # the files are located in the bash-doc package.
 
-#if test -n "$ZSH_VERSION"; then
-#   zsh
-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
+#if test -n "$BASH_VERSION"; then
+#   bash
 #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
+#fi
 
 if [ -z "$USER" ]; then
    USER="$LOGNAME"; export USER
@@ -39,7 +34,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
@@ -74,13 +69,17 @@ export ORGANIZATION # NNTPSERVER
 
 # Interactive only commands
 if [ -t 0 ] ; then
+   #if test -f .hushlogin && ! cmp -s .motd /etc/motd; then
+   #   tee $HOME/.motd < /etc/motd
+   #fi
+
    if [ -z "$TERM" ]; then
       eval `tset -Q -s -m 'network:?xterm'`
    fi
 
    stty sane erase ^H
 
-   if [ -n "`which less 2>/dev/null`" ]; then
+   if which less >/dev/null 2>&1; then
       HAS_LESS=true
    fi
 
@@ -126,9 +125,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'
@@ -175,33 +174,11 @@ if [ -t 0 ] ; then
    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=""
-         ;;
-      esac
-
-      OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W "
-      . "$ENV"
-
+      . "$HOME/.bashrc"
    else
-      OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` "
+      PS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` > "
    fi
 
-   #PROMPT_DIRTRIM=2
-   export OPS1 # PROMPT_DIRTRIM
-
    ### biff controls new mail notification
    #biff n
    ### mesg controls messages (write/talk) from other users
@@ -226,9 +203,17 @@ if [ -t 0 ] ; then
 
    unset name email
 
-   if test -f .hushlogin && ! cmp -s .motd /etc/motd; then
-      tee $HOME/.motd < /etc/motd
-   fi
+   #if which pyenv >/dev/null 2>&1; then
+   #   PYENV_ROOT="$HOME/.pyenv"
+   #   export PYENV_ROOT
+   #   PATH="$PYENV_ROOT/bin:$PATH"
+   #   eval "`pyenv init --path`"
+   #fi
+
+   #SCREENDIR="$HOME"/tmp/screen
+   #export SCREENDIR
+   #mkdir -p "$SCREENDIR"
+   #chmod 700 "$SCREENDIR"
 fi
 
 # No need to set DISPLAY - ssh sets DISPLAY and calls xauth
@@ -267,6 +252,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