X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.profile;h=4aa6cb369f8281cf816d9939fde30be034bfd56b;hb=b8e8910c9e10c660e8925edb5f9b53e660548179;hp=5fdca50d1fd5f09f9df350fe67769baac82e0d9f;hpb=14cb6c405d35b8dda7e1b8c26376a90a61642cd9;p=dotfiles.git

diff --git a/.profile b/.profile
index 5fdca50..4aa6cb3 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
@@ -74,6 +69,10 @@ 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
@@ -175,18 +174,9 @@ if [ -t 0 ] ; then
    fi
 
    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"
-
+      . "$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
 
    ### biff controls new mail notification
@@ -213,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
+   #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