sourcing flow improved, faster startups yeaaa
This commit is contained in:
parent
f77a77b034
commit
d33265970a
26
.bashrc
26
.bashrc
|
|
@ -2,6 +2,7 @@
|
|||
# ex: set ts=4 sw=4 ft=sh
|
||||
|
||||
# TODO: Test on solaris (and other unices). Many tools will fail since we're not considering /usr/xpg4/bin
|
||||
# TODO: Make more general purpose, currently quite bashy
|
||||
|
||||
# Exit when noninteractive. This is more portable than checking PS1.
|
||||
[ "${-#*i}" = "${-}" ] && return
|
||||
|
|
@ -12,29 +13,9 @@ _have_all () { while [ "${#}" -gt "0" ] ; do [ -x "$(_path_lookup "${1-}")" ] ||
|
|||
_have () { _have_all "${1-}" ; }
|
||||
_source_if () { [ -f "${1-}" ] && [ -r "${1-}" ] && . "${1-}" ; }
|
||||
|
||||
# TODO: Create ~/.local/bin directory and add ~/.local/bin to PATH
|
||||
# Add some basic scripts, like log.log, etc.
|
||||
############################ logging utils (posix) #############################
|
||||
log.log () {
|
||||
case "${1-}" in
|
||||
red) __ansi='41;30' ;;
|
||||
orange) __ansi='43;30' ;;
|
||||
blue) __ansi='44;30' ;;
|
||||
green) __ansi='42;30' ;;
|
||||
*) __ansi='45;30' ;;
|
||||
esac
|
||||
shift
|
||||
1>&2 printf "\033[${__ansi}m%s\033[m\n" "${*}"
|
||||
unset __ansi
|
||||
}
|
||||
log.err () { log.log red "${@}" ; }
|
||||
log.warn () { log.log orange "${@}" ; }
|
||||
log.info () { log.log blue "${@}" ; }
|
||||
log.good () { log.log green "${@}" ; }
|
||||
|
||||
###################### exit when already sourced (posix) #######################
|
||||
[ -n "${BASHRC_SOURCED}" ] && { log.err ".bashrc already sourced. Reset shell with 'exec bash [-l]' or start a new terminal." ; return 1 ; }
|
||||
BASHRC_SOURCED='1'
|
||||
BASHRC_SOURCED='1' # don't use export here, otherwise you can't start shells within shells
|
||||
|
||||
################################## bash reset ##################################
|
||||
# Set IFS to the default value, <space><tab><newline>
|
||||
|
|
@ -55,7 +36,10 @@ unalias -a
|
|||
unset -v POSIXLY_CORRECT
|
||||
|
||||
####################### per session environment (posix) ########################
|
||||
set | grep -sq '^\(TMUX_PANE\|SSH_CONNECTION\)' && exec 2>/dev/null
|
||||
[ -n "${DISPLAY-}" ] || log.warn 'DISPLAY not set'
|
||||
set | grep -sq '^\(TMUX_PANE\|SSH_CONNECTION\)' && exec 2>/dev/tty
|
||||
|
||||
BAT_THEME='gruvbox-dark' # BAT_THEME='gruvbox-light'
|
||||
GPG_TTY="$(tty)"
|
||||
|
||||
|
|
|
|||
63
.profile
63
.profile
|
|
@ -3,7 +3,31 @@
|
|||
|
||||
# TODO: Make more general purpose, currently quite bashy
|
||||
|
||||
############################## global environment ##############################
|
||||
# TODO: Create ~/.local/bin directory and add ~/.local/bin to PATH
|
||||
# Add some basic scripts, like log.log, etc.
|
||||
############################ logging utils (posix) #############################
|
||||
log.log () {
|
||||
case "${1-}" in
|
||||
red) __ansi='41;30' ;;
|
||||
orange) __ansi='43;30' ;;
|
||||
blue) __ansi='44;30' ;;
|
||||
green) __ansi='42;30' ;;
|
||||
*) __ansi='45;30' ;;
|
||||
esac
|
||||
shift
|
||||
1>&2 printf "\033[${__ansi}m%s\033[m\n" "${*}"
|
||||
unset __ansi
|
||||
}
|
||||
log.err () { log.log red "${@}" ; }
|
||||
log.warn () { log.log orange "${@}" ; }
|
||||
log.info () { log.log blue "${@}" ; }
|
||||
log.good () { log.log green "${@}" ; }
|
||||
|
||||
if [ -n "${PROFILE_SOURCED}" ] ; then
|
||||
###################### exit when already sourced (posix) #######################
|
||||
log.err ".profile already sourced. unset PROFILE_SOURCED to force reloading, or don't start a login session (e.g. leave the -l flag from bash)."
|
||||
else
|
||||
########################## global environment (posix) ##########################
|
||||
if ! [ -n "${USER-}" ] ; then
|
||||
if ! USER="$(2>/dev/null ps -o user= -p "${$}" | awk '{print $1}')" ; then
|
||||
if ! USER="$(2>/dev/null whoami)" ; then
|
||||
|
|
@ -50,25 +74,26 @@ export MANPAGER
|
|||
export PATH
|
||||
export LD_LIBRARY_PATH
|
||||
|
||||
####################### path append & prepend functions ########################
|
||||
pathvarprepend () {
|
||||
# prepending paths to pathvar denoted by the expansion of the PATHVAR parameter
|
||||
# if it's already in the PATH, move it to the end
|
||||
# POSIX compliant version
|
||||
|
||||
test -n "${2}" ||
|
||||
{ echo "Usage: pathvarprepend PATHVAR PATH_TO_ADD [PATH_TO_ADD...]";
|
||||
echo "Example: pathvarprepend LD_LIBRARY_PATH '${HOME}/.local/lib' '/usr/local/lib'";
|
||||
{ log.info "Usage: pathvarprepend PATHVAR PATH_TO_ADD [PATH_TO_ADD...]";
|
||||
log.info "Example: pathvarprepend LD_LIBRARY_PATH '${HOME}/.local/lib' '/usr/local/lib'";
|
||||
return 2; }
|
||||
|
||||
pathvar="${1}"
|
||||
shift
|
||||
|
||||
case $pathvar in (*[!abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*|""|[0123456789]*) false;; esac ||
|
||||
{ echo 'Expanded pathvar is not a valid name/variable identifier'; return 3; }
|
||||
{ log.err 'Expanded pathvar is not a valid name/variable identifier'; return 3; }
|
||||
|
||||
if [ "$pathvar" = "PATH" ]; then
|
||||
test "${-#*r}" = "${-}" ||
|
||||
{ echo 'Restricted shell, cannot change PATH'; return 4; }
|
||||
{ log.err 'Restricted shell, cannot change PATH'; return 4; }
|
||||
fi
|
||||
|
||||
path_prepend_error=0
|
||||
|
|
@ -86,10 +111,10 @@ pathvarprepend () {
|
|||
norm_path_to_add="${1}"
|
||||
|
||||
test "${norm_path_to_add#*:}" = "${norm_path_to_add}" ||
|
||||
{ echo 'Cannot add path with colon'; path_prepend_error="1"; continue; }
|
||||
{ log.warn 'Cannot add path with colon'; path_prepend_error="1"; continue; }
|
||||
|
||||
test -d "${norm_path_to_add}" ||
|
||||
{ echo "path_to_add ('${norm_path_to_add}') not a directory"; path_prepend_error="1"; continue; }
|
||||
{ log.warn "path_to_add ('${norm_path_to_add}') not a directory"; path_prepend_error="1"; continue; }
|
||||
|
||||
norm_path=$(printf %s ":$(eval "printf %s "'"'"\$$pathvar"'"'):" | head -n 1 | sed 's|/\+|/|g; s/\/$//; s/:/::/g') # fence with colons, ensure one line, deduplicate slashes, trim trailing, duplicate colons
|
||||
norm_path_to_add=$(printf %s "$norm_path_to_add" | head -n 1 | sed 's|/\+|/|g; s/\/$//') # ensure one line, deduplicate slashes, trim trailing
|
||||
|
|
@ -117,18 +142,18 @@ pathvarappend () {
|
|||
# POSIX compliant version
|
||||
|
||||
test -n "${2}" ||
|
||||
{ echo "Usage: pathappend PATHVAR PATH_TO_ADD [PATH_TO_ADD...]";
|
||||
echo "Example: pathappend LD_LIBRARY_PATH '${HOME}/.local/lib' '/usr/local/lib'";
|
||||
{ log.info "Usage: pathappend PATHVAR PATH_TO_ADD [PATH_TO_ADD...]";
|
||||
log.info "Example: pathappend LD_LIBRARY_PATH '${HOME}/.local/lib' '/usr/local/lib'";
|
||||
return 2; }
|
||||
|
||||
pathvar="${1}"
|
||||
|
||||
case "${pathvar}" in (*[!abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*|""|[0123456789]*) false;; esac ||
|
||||
{ echo 'Expanded pathvar is not a valid name/variable identifier'; return 3; }
|
||||
{ log.err 'Expanded pathvar is not a valid name/variable identifier'; return 3; }
|
||||
|
||||
if [ "${pathvar}" = "PATH" ]; then
|
||||
test "${-#*r}" = "${-}" ||
|
||||
{ echo 'Restricted shell, cannot change PATH'; return 4; }
|
||||
{ log.err 'Restricted shell, cannot change PATH'; return 4; }
|
||||
fi
|
||||
|
||||
path_append_error="0"
|
||||
|
|
@ -137,10 +162,10 @@ pathvarappend () {
|
|||
norm_path_to_add="${1}"
|
||||
|
||||
test "${norm_path_to_add#*:}" = "${norm_path_to_add}" ||
|
||||
{ echo 'Cannot add path with colon'; path_append_error="1"; continue; }
|
||||
{ log.warn 'Cannot add path with colon'; path_append_error="1"; continue; }
|
||||
|
||||
test -d "${norm_path_to_add}" ||
|
||||
{ echo "path_to_add ('${norm_path_to_add}') not a directory"; path_append_error="1"; continue; }
|
||||
{ log.warn "path_to_add ('${norm_path_to_add}') not a directory"; path_append_error="1"; continue; }
|
||||
|
||||
norm_path="$(printf %s ":$(eval "printf %s "'"'"\$${pathvar}"'"'):" | head -n 1 | sed 's|/\+|/|g; s/\/$//; s/:/::/g')" # fence with colons, ensure one line, deduplicate slashes, trim trailing, duplicate colons
|
||||
norm_path_to_add="$(printf %s "${norm_path_to_add}" | head -n 1 | sed 's|/\+|/|g; s/\/$//')" # ensure one line, deduplicate slashes, trim trailing
|
||||
|
|
@ -189,6 +214,7 @@ cdpath_prepend () {
|
|||
# ld_lib_path_append \
|
||||
# "${HOME}/.local/lib"
|
||||
|
||||
set | grep -sq '^\(TMUX_PANE\|SSH_CONNECTION\)' && exec 2>/dev/null
|
||||
path_prepend \
|
||||
"/bin" \
|
||||
"/sbin" \
|
||||
|
|
@ -207,6 +233,8 @@ path_append \
|
|||
"${HOME}/.local/sbin" \
|
||||
"${HOME}/.brew/bin" \
|
||||
"${GOPATH}/bin"
|
||||
set | grep -sq '^\(TMUX_PANE\|SSH_CONNECTION\)' && exec 2>/dev/tty
|
||||
|
||||
|
||||
# add cargo bin to path
|
||||
if [ -f "${HOME}/.cargo/env" ] && [ -r "${HOME}/.cargo/env" ]; then
|
||||
|
|
@ -217,7 +245,12 @@ export NVM_DIR="${HOME}/.nvm"
|
|||
[ -s "${NVM_DIR}/nvm.sh" ] && . "${NVM_DIR}/nvm.sh"
|
||||
[ -s "${NVM_DIR}/bash_completion" ] && . "${NVM_DIR}/bash_completion"
|
||||
|
||||
1>/dev/null pidof -q startx && 1>/home/tosuman/.startx.log 2>&1 startx
|
||||
if ! set | grep -sq '^\(TMUX_PANE\|SSH_CONNECTION\)' ; then
|
||||
pidof -q startx && 1>/home/tosuman/.startx.log 2>&1 startx || log.warn "Not starting X again"
|
||||
fi
|
||||
log.info ".profile sourced"
|
||||
export PROFILE_SOURCED='1'
|
||||
fi
|
||||
|
||||
# if running bash
|
||||
[ -n "${BASH_VERSINFO}" ] && if [ -f "${HOME}/.bashrc" ] && [ -r "${HOME}/.bashrc" ] && . "${HOME}/.bashrc"
|
||||
[ -n "${BASH_VERSINFO}" ] && [ -f "${HOME}/.bashrc" ] && [ -r "${HOME}/.bashrc" ] && . "${HOME}/.bashrc"
|
||||
|
|
|
|||
Loading…
Reference in New Issue