Permalink
Browse files

Change to using a generic .profile

Moved all bash-specific stuff and some environment variables off into the .bashrc. Left path configuration in .profile.
  • Loading branch information...
1 parent 3967d19 commit e67410778b23204ccedd82e279fdff796415cff3 Samuel Tesla committed Jul 9, 2010
Showing with 49 additions and 109 deletions.
  1. +0 −109 home/.bash_profile
  2. +18 −0 home/.bashrc
  3. +31 −0 home/.profile
View
@@ -1,109 +0,0 @@
-# Copyright (c) 2003 Samuel Tesla
-
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
-# details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-# Place, Suite 330, Boston, MA 02111-1307 USA
-
-# Begin ~/.bash_profile
-
-# Personal environment variables and startup programs.
-
-# Personal aliases and functions should go into ~/.bashrc. System-wide
-# environment variables and startup programs are in /etc/profile.
-# System-wide aliases and functions are in /etc/bashrc.
-
-if [ -f "$HOME/.bashrc" ] ; then
- source $HOME/.bashrc
-fi
-
-### PATH
-# General path additions
-PATH="/usr/local/bin:/usr/local/sbin:/usr/sbin:/sbin:/usr/X11R6/bin:/usr/games/bin:$PATH"
-PATH="/opt/local/lib/postgresql83/bin:/opt/local/bin:/opt/local/sbin:$PATH"
-PATH="$HOME/bin:$PATH"
-
-# Specific Applications
-[ -d /usr/local/apache/bin ] && PATH="/usr/local/apache/bin:$PATH"
-[ -d /usr/local/mysql/bin ] && PATH="/usr/local/mysql/bin:$PATH"
-[ -d /usr/local/pgsql/bin ] && PATH="/usr/local/pgsql/bin:$PATH"
-
-
-export JAVA_HOME=/Library/Java/Home
-export EC2_HOME=/opt/ec2-api-tools-1.3-41620
-PATH="$PATH:$EC2_HOME/bin"
-
-export PATH
-
-# Set MANPATH so it includes user's private manpage directory if it exists.
-
-if [ -d "$HOME/man" ]; then
- MANPATH=$HOME/man:$MANPATH
- export MANPATH
-fi
-
-# Set VisualWorks path info
-if [ -d "$HOME/VisualWorks" ]; then
- VISUALWORKS=$HOME/VisualWorks
-fi
-
-# Bash customizations.
-
-shopt -s checkhash # Verify that cached commands exist before execution.
-shopt -s checkwinsize # Update LINES and COLUMNS as necessary.
-shopt -s cmdhist # Save multi-line commands in a single history entry.
-shopt -s no_empty_cmd_completion # Do not complete on nothing.
-
-export HISTCONTROL=ignoredups
-export HISTIGNORE="&:[bf]g:exit:clear"
-
-# Preferred utility programs.
-
-BROWSER=
-EDITOR="vim"
-MAILER=
-PAGER="less -isR"
-VISUAL="vim"
-export BROWSER EDITOR MAILER PAGER VISUAL
-
-# Set up internationalization and localization.
-
-LANG=en_US
-LC_COLLATE=C
-LC_TIME=C
-LESSCHARSET=iso8859
-TZ=US/Central
-export LANG LC_COLLATE LC_TIME LESSCHARSET TZ
-
-# Set up the Python interpreter.
-
-export PYTHONSTARTUP=$HOME/.python.py
-
-# Set up environment variables controlling the CVS versioning system.
-
-CVSROOT=''
-CVS_RSH=ssh
-export CVSROOT CVS_RSH
-
-# Set up a default NFSEQ.
-
-export NFSEQ=`echo \*`
-
-# Ruby setup
-
-export RUBYOPT="rubygems"
-
-# Erlang setup
-
-export EJABBERD_LIB=/usr/local/var/lib/ejabberd
-
-# End ~/.bash_profile
View
@@ -42,6 +42,24 @@ export GOROOT=$HOME/go
export GOOS=darwin
export GOARCH=amd64
+# Preferred utility programs.
+
+BROWSER=
+EDITOR="vim"
+MAILER=
+PAGER="less -isR"
+VISUAL="vim"
+export BROWSER EDITOR MAILER PAGER VISUAL
+
+# bash customizations
+
+shopt -s checkhash # Verify that cached commands exist before execution.
+shopt -s checkwinsize # Update LINES and COLUMNS as necessary.
+shopt -s cmdhist # Save multi-line commands in a single history entry.
+shopt -s no_empty_cmd_completion # Do not complete on nothing.
+export HISTCONTROL=ignoredups
+export HISTIGNORE="&:[bf]g:exit:clear"
+
#
# Aliases
#
View
@@ -0,0 +1,31 @@
+# ~/.profile: executed by the command interpreter for login shells.
+# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login
+# exists.
+# see /usr/share/doc/bash/examples/startup-files for examples.
+# the files are located in the bash-doc package.
+
+# the default umask is set in /etc/profile; for setting the umask
+# for ssh logins, install and configure the libpam-umask package.
+#umask 022
+
+# if running bash
+if [ -n "$BASH_VERSION" ]; then
+ # include .bashrc if it exists
+ if [ -f "$HOME/.bashrc" ]; then
+ . "$HOME/.bashrc"
+ fi
+fi
+
+# set PATH so it includes user's private bin if it exists
+if [ -d "$HOME/bin" ] ; then
+ PATH="$HOME/bin:$PATH"
+fi
+
+
+# IL8N and L10N
+LANG=en_US
+LC_COLLATE=C
+LC_TIME=C
+LESSCHARSET=iso8859
+TZ=US/Central
+export LANG LC_COLLATE LC_TIME LESSCHARSET TZ

0 comments on commit e674107

Please sign in to comment.