From: Jannik Zander <59698@grundfos.com>
Date: Thu, 12 Jul 2018 07:42:18 +0000 (+0200)
Subject: Removed .bash_profile
X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=494ff98d0b2aac36add90a2a0f124776ff8c33f7;p=dotfiles.git

Removed .bash_profile
---

diff --git a/.bash_completion b/.bash_completion
index fb39c4e..ea03c1c 100644
--- a/.bash_completion
+++ b/.bash_completion
@@ -1,3 +1,5 @@
+[ -f /etc/bash_completion ] && . /etc/bash_completion
+
 # Add tab completion for `dit` by marking it as an alias for `git`
 _completion_loader git
 if type _git &>/dev/null; then
diff --git a/.bash_profile b/.bash_profile
deleted file mode 100644
index aa90e65..0000000
--- a/.bash_profile
+++ /dev/null
@@ -1,4 +0,0 @@
-# .bash_profile is for making sure that both the things in .profile and .bashrc are loaded for login shell.
-
-[ -f "${HOME}/.profile" ] && . "${HOME}/.profile"
-[ -f "${HOME}/.bashrc" ] && . "${HOME}/.bashrc"
diff --git a/.bashrc b/.bashrc
index 3c78dc3..ac45a72 100644
--- a/.bashrc
+++ b/.bashrc
@@ -53,7 +53,6 @@ HISTFILE=~/.bash_history.local
 PROMPT_COMMAND="history -a; $PROMPT_COMMAND"
 
 # Load completion, aliases, and local
-[ -f /etc/bash_completion ] && . /etc/bash_completion
-#[ -f ~/.bash_completion ] && . ~/.bash_completion;
+[ -f ~/.bash_completion ] && . ~/.bash_completion;
 [ -f ~/.bash_aliases ] && . ~/.bash_aliases;
 [ -f ~/.bashrc.local ] && . ~/.bashrc.local
diff --git a/.profile b/.profile
index f1d08b3..ad576d0 100644
--- a/.profile
+++ b/.profile
@@ -41,4 +41,6 @@ export LESS=" -R "
 # colored GCC warnings and errors
 export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
-
+if [ ! "x${BASH_VERSION}" = "x" ]; then
+  [ -f "${HOME}/.bashrc" ] && . "${HOME}/.bashrc"
+fi