Cleaning up bash startup files

This commit is contained in:
Daniel - 2018-07-15 10:24:42 +02:00
parent 15bb6a8751
commit e6886b6fc4
Signed by: dbo
GPG Key ID: 4F63DB96D45AA9C6
2 changed files with 32 additions and 84 deletions

View File

@ -1,7 +1,10 @@
if [ -n "$PS1" -a "x$TERM" != "xdumb" -a "`zsh -c '[[ "a" =~ "a" ]] && echo 1' 2> /dev/null`" ]
then
exec zsh --login
fi
# -*- sh -*-
export LANG=en_US.UTF-8
[[ -r ~/.bashrc ]] && . ~/.bashrc
[[ -r /etc/bashrc ]] && . /etc/bashrc
[[ -r ~/.bashrc ]] && . ~/.bashrc
PATH=$HOME/.local/bin/:$PATH
export PATH

103
bashrc
View File

@ -1,102 +1,53 @@
# ~/.bashrc: executed by bash(1) for non-login shells.
# Based on example .bashrc as provided by Debian
# -*- sh -*-
# Set correct language environment
export LANG=en_US.UTF-8
# Based on example .bashrc as provided by Debian
# If not running interactively, don't do anything
[ -z "$PS1" ] && return
# don't put duplicate lines in the history. See bash(1) for more options
# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
HISTCONTROL=$HISTCONTROL${HISTCONTROL+:}ignoredups
# ... or force ignoredups and ignorespace
# History control
HISTCONTROL=ignoreboth
HISTZIE=20000
# append to the history file, don't overwrite it
# Append to the history file, don't overwrite it
shopt -s histappend
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
# Correctly save multiline commands in the history
shopt -s cmdhist
shopt -s lithist
# No clobbering
shopt -o -s noclobber
# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
# Check the window size after each command and, if necessary,
# Update the values of LINES and COLUMNS.
shopt -s checkwinsize
# Enable Emacs-style M-p and M-n behavior
bind '"\ep": history-search-backward'
bind '"\en": history-search-forward'
# make less more friendly for non-text input files, see lesspipe(1)
#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
# set variable identifying the chroot you work in (used in the prompt below)
if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
# Simple prompt in the form of user@host:dir, with trailing newline
PS1="\u@\h:\w\a\]\n-\$ "
# set a fancy prompt (non-color, unless we know we "want" color)
case "$TERM" in
xterm-color) color_prompt=yes;;
esac
# uncomment for a colored prompt, if the terminal has the capability; turned
# off by default to not distract the user: the focus in a terminal window
# should be on the output of commands, not on the prompt
#force_color_prompt=yes
if [ -n "$force_color_prompt" ]; then
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
# We have color support; assume it's compliant with Ecma-48
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
# a case would tend to support setf rather than setaf.)
color_prompt=yes
else
color_prompt=
fi
fi
if [ "$color_prompt" = yes ]; then
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
else
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
fi
unset color_prompt force_color_prompt
# 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
# enable color support of ls and also add handy aliases
# Enable color support of ls and also add handy aliases
if [ -x /usr/bin/dircolors ]; then
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
alias ls='ls --color=auto'
#alias dir='dir --color=auto'
#alias vdir='vdir --color=auto'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
alias ls='ls --color=auto'
alias grep='grep --color=auto'
alias fgrep='fgrep --color=auto'
alias egrep='egrep --color=auto'
fi
# some more ls aliases
# Some more ls aliases
alias ll='ls -l'
alias la='ls -A'
alias l='ls -CF'
alias ..='cd ..'
# 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
# enable programmable completion features (you don't need to enable
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
# sources /etc/bash.bashrc).
@ -104,9 +55,3 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
. /etc/bash_completion
fi
# custom path
export PATH=$HOME/.local/bin/:$PATH
# more keybindings
bind '"\ep": history-search-backward'
bind '"\en": history-search-forward'