rpms/bash
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert change to always source from /etc/bashrc

Browse Source 
/etc/bashrc is now again sourced from user's ~/.bashrc
  Related: #1193590
This commit is contained in:
Siteshwar Vashisht 2017-10-30 14:48:42 +01:00
parent 7bfd9a2992
commit 533b8a0735
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bash.spec
View File

@ -7,7 +7,7 @@
Version: %{baseversion}%{patchleveltag} Version: %{baseversion}%{patchleveltag}
Name: bash Name: bash
Summary: The GNU Bourne Again shell Summary: The GNU Bourne Again shell
Release: 11%{?dist} Release: 12%{?dist}
License: GPLv3+ License: GPLv3+
Url: http://www.gnu.org/software/bash Url: http://www.gnu.org/software/bash
Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz Source0: ftp://ftp.gnu.org/gnu/bash/bash-%{baseversion}.tar.gz
@ -129,7 +129,7 @@ autoconf
# Recycles pids is neccessary. When bash's last fork's pid was X # Recycles pids is neccessary. When bash's last fork's pid was X
# and new fork's pid is also X, bash has to wait for this same pid. # and new fork's pid is also X, bash has to wait for this same pid.
# Without Recycles pids bash will not wait. # Without Recycles pids bash will not wait.
make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DSYS_BASHRC='\"/etc/bashrc\"' -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" %{?_smp_mflags} make "CPPFLAGS=-D_GNU_SOURCE -DRECYCLES_PIDS -DDEFAULT_PATH_VALUE='\"/usr/local/bin:/usr/bin\"' `getconf LFS_CFLAGS`" %{?_smp_mflags}
%install %install
if [ -e autoconf ]; then if [ -e autoconf ]; then
@ -304,6 +304,9 @@ end
%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
%changelog %changelog
* Mon Oct 30 2017 Siteshwar Vashisht <svashisht@redhat.com> - 4.4.12-12
- Revert change to always source from /etc/bashrc
* Tue Aug 29 2017 Siteshwar Vashisht <svashisht@redhat.com> - 4.4.12-11 * Tue Aug 29 2017 Siteshwar Vashisht <svashisht@redhat.com> - 4.4.12-11
- Always source from /etc/bashrc - Always source from /etc/bashrc
Resolves: #1193590 Resolves: #1193590

5
dot-bashrc
View File

@ -1,5 +1,10 @@
# .bashrc # .bashrc
# Source global definitions
if [ -f /etc/bashrc ]; then
. /etc/bashrc
fi
# Uncomment the following line if you don't like systemctl's auto-paging feature: # Uncomment the following line if you don't like systemctl's auto-paging feature:
# export SYSTEMD_PAGER= # export SYSTEMD_PAGER=