X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.profile;h=29723ad08b6245144e10930c7316e165ef8056cb;hb=8eb93b531d2772fcaefd3deb830a73a24f90ee45;hp=4e9958e77ef43e744245e8ca4bb17693eb308692;hpb=cc4271cd8c256a378472017827a04c83f951347c;p=dotfiles.git

diff --git a/.profile b/.profile
index 4e9958e..29723ad 100644
--- a/.profile
+++ b/.profile
@@ -8,13 +8,8 @@
 # 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
+#if test -n "$BASH_VERSION"; then
+#   bash
 #elif test -n "$KSH_VERSION"; then
 #   ksh93
 #elif test -n "$FCEDIT"; then
@@ -25,7 +20,7 @@ if test -n "$BASH_VERSION"; then
 #   unknown
 #else
 #   sh
-fi
+#fi
 
 if [ -z "$USER" ]; then
    USER="$LOGNAME"; export USER
@@ -175,32 +170,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
 
-   export OPS1
-
    ### biff controls new mail notification
    #biff n
    ### mesg controls messages (write/talk) from other users
@@ -228,6 +202,14 @@ if [ -t 0 ] ; then
    #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
+
 fi
 
 # No need to set DISPLAY - ssh sets DISPLAY and calls xauth
@@ -303,18 +285,3 @@ 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 ] &&
-   which screen >/dev/null 2>&1
-then
-   exec screen -xRR -S default
-fi