diff --git a/PKGBUILD b/PKGBUILD index c02c7c4..c588db9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Aaron Griffin pkgbase=bash -pkgname=('bash' 'bashrc-manjaro' 'bashrc-manjaro-plasma') +pkgname=('bash' 'bashrc-manjaro') _basever=5.0 _patchlevel=011 pkgver=${_basever}.${_patchlevel} @@ -14,7 +14,6 @@ license=('GPL') url='http://www.gnu.org/software/bash/bash.html' source=(https://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} 'dot.bashrc' - 'dot.bashrc-plasma' 'dot.bash_profile' 'dot.bash_logout' 'system.bashrc' @@ -22,7 +21,6 @@ source=(https://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} sha256sums=('b4a80f2ac66170b2913efbfb9f2594f1f76c7b1afd11f799e22035d63077fb4d' 'SKIP' 'ea3fb1f21b1ad236701e59598a57fe3d903ad844c85ae4691ed76aa2f0af49a2' - 'bf550797b3e2b1a519dbbfb02905b7314795fc4dbe209592f1f870a9478685d1' 'e149407c2bee17779caec70a7edd3d0000d172e7e4347429b80cb4d55bcec9c2' '4330edf340394d0dae50afb04ac2a621f106fe67fb634ec81c4bfb98be2a1eb5' '5fdc20c44bc9058f728d11111327f4dbb5598fec4d948dd5265211598667f9f0' @@ -112,15 +110,3 @@ package_bashrc-manjaro() { install -Dm644 system.bashrc "$pkgdir"/etc/bash.bashrc install -Dm644 dot.bashrc "$pkgdir"/etc/skel/.bashrc } - -# workaround for envars not being exported from ~/.profile in plasma -package_bashrc-manjaro-plasma() { - pkgdesc="Manjaro-KDE's default bashrc" - arch=('any') - backup=('etc/bash.bashrc' 'etc/skel/.bashrc') - depends=('bash') - provides=('bashrc') - conflicts=('bashrc-manjaro') - install -Dm644 system.bashrc "$pkgdir"/etc/bash.bashrc - install -Dm644 dot.bashrc-plasma "$pkgdir"/etc/skel/.bashrc -} diff --git a/dot.bashrc-plasma b/dot.bashrc-plasma deleted file mode 100644 index 935a459..0000000 --- a/dot.bashrc-plasma +++ /dev/null @@ -1,141 +0,0 @@ -# -# ~/.bashrc -# - -[[ $- != *i* ]] && return - -colors() { - local fgc bgc vals seq0 - - printf "Color escapes are %s\n" '\e[${value};...;${value}m' - printf "Values 30..37 are \e[33mforeground colors\e[m\n" - printf "Values 40..47 are \e[43mbackground colors\e[m\n" - printf "Value 1 gives a \e[1mbold-faced look\e[m\n\n" - - # foreground colors - for fgc in {30..37}; do - # background colors - for bgc in {40..47}; do - fgc=${fgc#37} # white - bgc=${bgc#40} # black - - vals="${fgc:+$fgc;}${bgc}" - vals=${vals%%;} - - seq0="${vals:+\e[${vals}m}" - printf " %-9s" "${seq0:-(default)}" - printf " ${seq0}TEXT\e[m" - printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m" - done - echo; echo - done -} - -[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion - -# Change the window title of X terminals -case ${TERM} in - xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007"' - ;; - screen*) - PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\"' - ;; -esac - -use_color=true - -# Set colorful PS1 only on colorful terminals. -# dircolors --print-database uses its own built-in database -# instead of using /etc/DIR_COLORS. Try to use the external file -# first to take advantage of user additions. Use internal bash -# globbing instead of external grep binary. -safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM -match_lhs="" -[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)" -[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(/dev/null \ - && match_lhs=$(dircolors --print-database) -[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true - -if ${use_color} ; then - # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 - if type -P dircolors >/dev/null ; then - if [[ -f ~/.dir_colors ]] ; then - eval $(dircolors -b ~/.dir_colors) - elif [[ -f /etc/DIR_COLORS ]] ; then - eval $(dircolors -b /etc/DIR_COLORS) - fi - fi - - if [[ ${EUID} == 0 ]] ; then - PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] ' - else - PS1='\[\033[01;32m\][\u@\h\[\033[01;37m\] \W\[\033[01;32m\]]\$\[\033[00m\] ' - fi - - alias ls='ls --color=auto' - alias grep='grep --colour=auto' - alias egrep='egrep --colour=auto' - alias fgrep='fgrep --colour=auto' -else - if [[ ${EUID} == 0 ]] ; then - # show root@ when we don't have colors - PS1='\u@\h \W \$ ' - else - PS1='\u@\h \w \$ ' - fi -fi - -unset use_color safe_term match_lhs sh - -alias cp="cp -i" # confirm before overwriting something -alias df='df -h' # human-readable sizes -alias free='free -m' # show sizes in MB -alias np='nano -w PKGBUILD' -alias more=less - -xhost +local:root > /dev/null 2>&1 - -complete -cf sudo - -# Bash won't get SIGWINCH if another process is in the foreground. -# Enable checkwinsize so that bash will check the terminal size when -# it regains control. #65623 -# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) -shopt -s checkwinsize - -shopt -s expand_aliases - -# export QT_SELECT=4 -export EDITOR=/usr/bin/nano -export BROWSER=/usr/bin/firefox - -# Enable history appending instead of overwriting. #139609 -shopt -s histappend - -# -# # ex - archive extractor -# # usage: ex -ex () -{ - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) tar xjf $1 ;; - *.tar.gz) tar xzf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar x $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xf $1 ;; - *.tbz2) tar xjf $1 ;; - *.tgz) tar xzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1;; - *.7z) 7z x $1 ;; - *) echo "'$1' cannot be extracted via ex()" ;; - esac - else - echo "'$1' is not a valid file" - fi -}