From 5408d7d473f63fc2c8110f44a3784579163efa6e Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Tue, 19 Jun 2012 16:08:08 +1200
Subject: Put everything including paths stuff in .bashrc.

Heresy, I know, but I'm sick of dealing with the distinction between
login shells and non-login shells, particularly as far as my $PATH is
concerned.
---
 bash/bash_profile | 21 +--------------------
 bash/bashrc       | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/bash/bash_profile b/bash/bash_profile
index 6c0b3cb0..0447bddd 100644
--- a/bash/bash_profile
+++ b/bash/bash_profile
@@ -1,22 +1,3 @@
-# Source .bashrc if it exists.
+# Just source .bashrc if it exists.
 [[ -e "${HOME}/.bashrc" ]] && source "${HOME}/.bashrc"
 
-# Add various paths if they exist.
-DIRS="${HOME}/bin
-      /usr/local/apache/bin
-      /usr/local/mysql/bin
-      /usr/local/nagios/bin
-      /usr/local/pgsql/bin"
-for DIR in $DIRS; do
-    if [[ -d "$DIR" ]] && [[ ":${PATH}:" != *":${DIR}:"* ]]; then
-        if [[ -n "$PATH" ]]; then
-            PATH="${DIR}:${PATH}"
-        else
-            PATH=$DIR
-        fi
-    fi
-done
-
-# None of this UTF8 drawing characters nonsense.
-export NCURSES_NO_UTF8_ACS=1
-
diff --git a/bash/bashrc b/bash/bashrc
index 8b4686e1..2cd1f905 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -4,6 +4,9 @@
 # Use vi as my text editor.
 export EDITOR=vi
 
+# None of this UTF8 drawing characters nonsense.
+export NCURSES_NO_UTF8_ACS=1
+
 # Keep plenty of history.
 unset HISTFILESIZE
 HISTSIZE=1000000
@@ -53,6 +56,22 @@ hash stty &>/dev/null && stty -ixon
 # SSH agent setup, if available.
 [[ -e "${HOME}/.ssh/agent" ]] && source "${HOME}/.ssh/agent"
 
+# Add various paths if they exist and aren't already in here.
+DIRS="${HOME}/bin
+      /usr/local/apache/bin
+      /usr/local/mysql/bin
+      /usr/local/nagios/bin
+      /usr/local/pgsql/bin"
+for DIR in $DIRS; do
+    if [[ -d "$DIR" ]] && [[ ":${PATH}:" != *":${DIR}:"* ]]; then
+        if [[ -n "$PATH" ]]; then
+            PATH="${DIR}:${PATH}"
+        else
+            PATH=$DIR
+        fi
+    fi
+done
+
 # If we're using an xterm, force 256 colors.
 case "$TERM" in
     xterm*) TERM=xterm-256color;;
-- 
cgit v1.2.3