X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.profile;h=581885092317f725fe1341be58fd61b99b5da300;hp=8a1f15295050bacdee9766a12fbc7b52a9347897;hb=542f2a97ae5094eb88116ffa02fc441ba95dae47;hpb=90408552910ffa146a246fa96e6095661b3bbdb9

diff --git a/.profile b/.profile
index 8a1f152..5818850 100644
--- a/.profile
+++ b/.profile
@@ -8,8 +8,6 @@
 # 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) ;;
@@ -21,6 +19,8 @@ if test -n "$BASH_VERSION"; then
 #   ksh93
 #elif test -n "$FCEDIT"; then
 #   ksh88
+#elif test -n "$ZSH_VERSION"; then
+#   zsh
 #elif test -n "$PS3"; then
 #   unknown
 #else
@@ -39,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
@@ -80,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
 
@@ -126,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'
@@ -192,15 +192,14 @@ if [ -t 0 ] ; then
          ;;
       esac
 
-      OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W "
+      OPS1=${OPS1}"${debian_chroot:+($debian_chroot)}\u@\h \W \\$"
       . "$ENV"
 
    else
-      OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` "
+      OPS1="${debian_chroot:+($debian_chroot)}`/usr/bin/whoami`@`/bin/hostname -s` >"
    fi
 
-   #PROMPT_DIRTRIM=2
-   export OPS1 # PROMPT_DIRTRIM
+   export OPS1
 
    ### biff controls new mail notification
    #biff n
@@ -226,9 +225,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
@@ -304,3 +303,17 @@ fi
 #
 #    fi
 # fi
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return ;;
+esac
+
+# Stop if non-interactive shell
+[ -z "$PS1" ] && return
+
+if [ -n "$SSH_CONNECTION" -a -z "$STY" -a -t 0 -a -x /usr/bin/screen ]
+then
+   exec /usr/bin/screen -xRR -S default
+fi