Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77stuff.git;a=commitdiff;h=6b35dc6f6a6c49448e879781f88c142da5661492
commit 6b35dc6f6a6c49448e879781f88c142da5661492 Author: Marius Cirsta <[email protected]> Date: Thu Feb 26 00:58:26 2015 +0200 bash-4.3_033-2-x86_64 * fix bash completion diff --git a/source/base/bash/FrugalBuild b/source/base/bash/FrugalBuild index dcc7185..fba10dc 100644 --- a/source/base/bash/FrugalBuild +++ b/source/base/bash/FrugalBuild @@ -10,7 +10,7 @@ if [ -z "$patchver" ]; then else pkgver=${basever}_$patchver fi -pkgrel=1 +pkgrel=2 pkgdesc="The GNU Bourne Again shell" url="http://tiswww.case.edu/php/chet/bash/bashtop.html"; #dlurl="ftp://ftp.cwru.edu/pub/$pkgname"; @@ -20,8 +20,8 @@ depends=('glibc>=2.8-3' 'readline>=6.2') groups=('base' 'core') archs=('i686' 'x86_64' 'arm') up2date="echo \$(lynx -dump $url|grep current|sed -n -e 's/.*bash-\(.*\)\. .*$/\1/' -e '1 p')\$(lynx -dump "$dlurl/bash-$basever-patches"|grep 'bash${basever//.}-[0-9]\{3\}'|sed -n 's/.*bash${basever//.}-\([0-9]\{3\}\).*/_\1/;$ p')" -source=("$dlurl/$pkgname-$basever.tar.gz" profile shells bashrc) -signatures=("${source[0]}.sig" '' '' '') +source=("$dlurl/$pkgname-$basever.tar.gz" profile shells bashrc system.bashrc) +signatures=("${source[0]}.sig" '' '' '' '') if [ -n "$patchver" ]; then for i in `seq -w $patchver` @@ -34,6 +34,8 @@ fi build() { + _bashconfig=(-DSYS_BASHRC=\'\"/etc/bashrc\"\') + export CFLAGS="${CFLAGS} ${_bashconfig[@]}" Fcd $pkgname-$basever for i in `seq -w $patchver` do @@ -44,6 +46,7 @@ build() Fmv /usr/bin / Ffile profile shells /etc/ Ffile bashrc /etc/skel/.bashrc + Ffile system.bashrc /etc/bashrc Fln bash /bin/sh } diff --git a/source/base/bash/bashrc b/source/base/bash/bashrc index 4fa75c1..da7e68a 100644 --- a/source/base/bash/bashrc +++ b/source/base/bash/bashrc @@ -4,8 +4,6 @@ if [ "$PS1" ]; then if [ -e /etc/profile ]; then source /etc/profile - #source this here not in profile to avoid other shells sourcing it - [ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion fi if [ -e ~/.bash_login ]; then source ~/.bash_login diff --git a/source/base/bash/system.bashrc b/source/base/bash/system.bashrc new file mode 100644 index 0000000..4d7a643 --- /dev/null +++ b/source/base/bash/system.bashrc @@ -0,0 +1,23 @@ +# +# /etc/bash.bashrc +# + +# If not running interactively, don't do anything +[[ $- != *i* ]] && return + +PS1='[\u@\h \W]\$ ' +PS2='> ' +PS3='> ' +PS4='+ ' + +case ${TERM} in + xterm*|rxvt*|Eterm|aterm|kterm|gnome*) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' + + ;; + screen) + PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND; }'printf "\033_%s@%s:%s\033\\" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"' + ;; +esac + +[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
