Run the .bashrc and slight formatting adjustment

Slight formatting change and replaced sourcing all dotfiles with
running just the .bashrc
This commit is contained in:
Kris Lamoureux 2020-01-12 01:22:22 -05:00
parent 30c67915f6
commit 7edccd44e9
Signed by: kris
GPG Key ID: 3EDA9C3441EDA925
2 changed files with 7 additions and 6 deletions

View File

@ -61,6 +61,6 @@ alias 'day'='redshift -x'
# SOCKS proxy over SSH # SOCKS proxy over SSH
alias 'socks'='screen -dm ssh -D 1337 -q -C -N' alias 'socks'='screen -dm ssh -D 1337 -q -C -N'
if [ -f ~/.other_aliases ] ; then if [ -f ~/.other_aliases ]; then
source ~/.other_aliases source ~/.other_aliases
fi fi

View File

@ -12,12 +12,12 @@ for FILE in $DOTFILES ; do
NEWLINK=0 NEWLINK=0
# Exclude the repo's .git folder # Exclude the repo's .git folder
if [ "$BASEFILE" != ".git" ] ; then if [ "$BASEFILE" != ".git" ]; then
# If basefile is a link # If basefile is a link
if [ -L ~/$BASEFILE ] ; then if [ -L ~/$BASEFILE ]; then
# If basefile is not a file, and therefore is a broken symlink # If basefile is not a file, and therefore is a broken symlink
if [ ! -f ~/$BASEFILE ] ; then if [ ! -f ~/$BASEFILE ]; then
read -p "Press [ENTER] to replace broken symlink ~/$BASEFILE. CTRL+C aborts" read -p "Press [ENTER] to replace broken symlink ~/$BASEFILE. CTRL+C aborts"
rm ~/$BASEFILE rm ~/$BASEFILE
NEWLINK=1 NEWLINK=1
@ -25,7 +25,7 @@ for FILE in $DOTFILES ; do
echo "~/$BASEFILE is already linked." echo "~/$BASEFILE is already linked."
fi fi
# If basefile is a regular file # If basefile is a regular file
elif [ -f ~/$BASEFILE ] ; then elif [ -f ~/$BASEFILE ]; then
DATE=$(date '+%Y%m%d%H%M%S') DATE=$(date '+%Y%m%d%H%M%S')
read -p "Press [ENTER] to move ~/$BASEFILE to ~/$BASEFILE-$DATE. CTRL+C aborts" read -p "Press [ENTER] to move ~/$BASEFILE to ~/$BASEFILE-$DATE. CTRL+C aborts"
mv ~/$BASEFILE ~/$BASEFILE-$DATE mv ~/$BASEFILE ~/$BASEFILE-$DATE
@ -39,8 +39,9 @@ for FILE in $DOTFILES ; do
if [ $NEWLINK -eq 1 ] ; then if [ $NEWLINK -eq 1 ] ; then
echo "Creating new link to $(pwd)/$BASEFILE from" ~ echo "Creating new link to $(pwd)/$BASEFILE from" ~
ln -s $(pwd)/$BASEFILE ~/$BASEFILE ln -s $(pwd)/$BASEFILE ~/$BASEFILE
source ~/$BASEFILE
fi fi
fi fi
done done
. ~/.bashrc