Skip to content

Commit

Permalink
Cleanup; Drop *_SOURCED variables
Browse files Browse the repository at this point in the history
  • Loading branch information
shalomb committed Apr 21, 2018
1 parent 8f358ec commit 0e6ec88
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 22 deletions.
3 changes: 0 additions & 3 deletions .config/bash/aliases
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@

[[ ${-//[!i]/} ]] || return

# export BASH_ALIASES_SOURCED="$(date +%s)|$BASH_ALIASES_SOURCED"
# export BASH_ALIASES_SOURCED_BY="$BASH_ALIASES_SOURCED_BY|$(ps -p $$ -o pid= -o ppid= -o comm= -o args= -o fuser=) $(date +%s)"

shopt -s nullglob dotglob extglob

aliases_files=(
Expand Down
12 changes: 2 additions & 10 deletions .config/bash/bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,10 @@
# If not running interactively, don't do anything, just return
[[ ${-//[!i]/} ]] || return

# source ~/.profile if
# * ~/.config/bashrc hasn't been sourced before - for interactive shells
# * it hasn't already been marked as sourced.
if [[ -z $PROFILE_SOURCED ]]; then
if [[ -e ~/.config/profile ]]; then
source ~/.config/profile && PROFILE_SOURCED=1
fi
if [[ -e ~/.config/profile ]]; then
source ~/.config/profile
fi

# export BASHRC_SOURCED="$BASHRC_SOURCED|$(date +%s)"
# export BASHRC_SOURCED_BY="$BASHRC_SOURCED_BY|$(ps -p $$ -o pid= -o ppid= -o comm= -o args= -o fuser=) $(date +%s)"

export FCEDIT="$EDITOR"

export IGNOREEOF=5
Expand Down
4 changes: 2 additions & 2 deletions .config/bash/profile
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ if [[ $TERM == 'linux' ]]; then
fi

if [[ -r ~/.config/bash/bashrc ]]; then
source ~/.config/bash/bashrc && BASHRC_SOURCED=1
source ~/.config/bash/bashrc
fi

if [[ ${TTY:-$(tty)} == /dev/tty1 ]]; then
unset TMOUT
tmout 5 "exec startx > $TMP/startx.log 2>&1"
tmout 5 "exec startx > $TMP/startx.log 2>&1"
TMOUT=120
clear
fi
7 changes: 0 additions & 7 deletions .config/profile
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@
# to us). #
##############################################################################

# Let everyone know this file was sourced.
# we'll use it to break never-ending cyclic loops.
# PROFILE_SOURCED="`date +%s`";
# PROFILE_SOURCED_BY="$PROFILE_SOURCED_BY|`ps -p $$ -o pid= -o ppid= -o comm= -o args= -o fuser=` `date +%s`";
# export PROFILE_SOURCED;
# export PROFILE_SOURCED_BY;

PATH="$HOME/.local/bin:$HOME/.bin:$PATH"

PATH="$PATH:/usr/bin/:/bin/:/usr/local/sbin:/usr/sbin:/sbin:/opt/bin"
Expand Down

0 comments on commit 0e6ec88

Please sign in to comment.