From db97d519c1b26868580d9fd1c93d4bbb8eaaafc8 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Fri, 18 Nov 2016 06:25:01 +0100 Subject: [PATCH] daily autocommit --- profile.d/fbrehm.sh | 30 +++++++++++++++++++++++++++--- skel/.bashrc | 25 +++++++++++++++++++++---- 2 files changed, 48 insertions(+), 7 deletions(-) diff --git a/profile.d/fbrehm.sh b/profile.d/fbrehm.sh index 69a4f91..9508d55 100644 --- a/profile.d/fbrehm.sh +++ b/profile.d/fbrehm.sh @@ -12,9 +12,6 @@ HISTCONTROL=ignoredups:ignorespace # append to the history file, don't overwrite it shopt -s histappend -# coloring grep: -#export GREP_OPTIONS='--color=auto' -#export GREP_COLOR='1;32' # hold these special chars when piping to less export LESS="--RAW-CONTROL-CHARS" @@ -124,6 +121,33 @@ if [[ -f ~/.bash_aliases ]]; then . ~/.bash_aliases fi +if [ -d /usr/scripts ] ; then + PATH=/usr/scripts:$PATH + export PATH +fi + +if [ -d $HOME/bin ] ; then + PATH=$PATH:$HOME/bin + export PATH +fi + +if [[ -d "$HOME/lib" ]] ; then + if [[ -d "$HOME/lib/perl" ]] ; then + if [[ -z "${PERL5LIB}" ]] ; then + export PERL5LIB="$HOME/lib/perl" + else + export PERL5LIB="$HOME/lib/perl:${PERL5LIB}" + fi + fi + if [[ -d "$HOME/lib/python" ]] ; then + if [[ -z "${PYTHONPATH}" ]] ; then + export PYTHONPATH="$HOME/lib/python" + else + export PYTHONPATH="$HOME/lib/python:${PYTHONPATH}" + fi + fi +fi + # enable bash completion in interactive shells if ! shopt -oq posix; then if [[ -f /usr/share/bash-completion/bash_completion ]]; then diff --git a/skel/.bashrc b/skel/.bashrc index f10e8e6..6d42d5f 100644 --- a/skel/.bashrc +++ b/skel/.bashrc @@ -8,11 +8,28 @@ case $- in *) return;; esac -if [[ -f /etc/profile.d/fbrehm.sh ]] ; then +# If set, the pattern "**" used in a pathname expansion context will +# match all files and zero or more directories and subdirectories. +#shopt -s globstar - if [[ $( type -t prompt_status || true ) != 'function' ]] ; then - . /etc/profile.d/fbrehm.sh - fi +# make less more friendly for non-text input files, see lesspipe(1) +#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" +# If this is an xterm set the title to user@host:dir +#case "$TERM" in +#xterm*|rxvt*) +# PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1" +# ;; +#*) +# ;; +#esac + +# Alias definitions. +# You may want to put all your additions into a separate file like +# ~/.bash_aliases, instead of adding them here directly. +# See /usr/share/doc/bash-doc/examples in the bash-doc package. + +if [ -f ~/.bash_aliases ]; then + . ~/.bash_aliases fi -- 2.39.5