.sh

commit 583eadf42a1effdf8dff52ab22c4d2577d2e839a
parent 9adaa565161bdca8589a50e0b05b47ac8eb344f8
Author: Byron Torres <b@torresjrjr.com>
Date:   Wed,  2 Mar 2022 00:36:24 +0000

New .bash_profile

Diffstat:
M
bash/.bash_profile
 | 
13
++++++++++---
M
bin/dotshell
 | 
2
+-
M
sh/.profile
 | 
8
+-------

3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/bash/.bash_profile b/bash/.bash_profile
@@ -1,13 +1,20 @@
 #
 # ~/.bash_profile
 #
-# This is a redundant file since bash will source ~/.profile instead.
 
 ## Common
 
-#source ~/.profile
+. $DOTSHELL/sh/.profile
+
+
+## Local
+
+[ -f "$DOTSHELL/local/.bash_profile" ] &&
+   . "$DOTSHELL/local/.bash_profile"
 
 
 ## Runtime
 
-#[[ -f ~/.bashrc ]] && . ~/.bashrc
+# interactive login bash doesn't source .bashrc
+[ -n "${BASH_VERSION}" ] &&
+   . "$DOTSHELL/bash/.bashrc"
diff --git a/bin/dotshell b/bin/dotshell
@@ -38,7 +38,7 @@ do
 			sync_dotfile "$DOTSHELL/sh/.profile"  "$HOME/.profile"
 			;;
 		bash)
-			sync_dotfile "$DOTSHELL/sh/.profile"  "$HOME/.profile"
+			sync_dotfile "$DOTSHELL/bash/.bash_profile"  "$HOME/.bash_profile"
 			sync_dotfile "$DOTSHELL/bash/.bashrc" "$HOME/.bashrc"
 			;;
 		zsh)
diff --git a/sh/.profile b/sh/.profile
@@ -1,7 +1,7 @@
 #
 # ~/.profile
 #
-# Local script for interactive POSIX login sh and bash.
+# Local script for interactive POSIX login sh
 
 
 ## Env
@@ -38,9 +38,3 @@ export PASSWORD_STORE_GENERATED_LENGTH=64
 
 [ -f "$DOTSHELL/local/.profile" ] &&
    . "$DOTSHELL/local/.profile"
-
-
-## Runtime
-
-# interactive login bash doesn't source .bashrc
-[ -n "${BASH_VERSION}" ] && . "$DOTSHELL/bash/.bashrc"