[arch-commits] Commit in bash/trunk (6 files)

[Allan McRae]

    Date: Tuesday, January 4, 2011 @ 10:30:53
  Author: allan
Revision: 104608

add all configuration files used by bash to the package and make sure they are backed up

Added:
  bash/trunk/dot.bash_logout
  bash/trunk/dot.bash_profile
  bash/trunk/dot.bashrc
    (from rev 104606, bash/trunk/bashrc)
  bash/trunk/system.bash_logout
Modified:
  bash/trunk/PKGBUILD
Deleted:
  bash/trunk/bashrc

--------------------+
 PKGBUILD           |   31 +++++++++++++++++++++----------
 bashrc             |    5 -----
 dot.bash_logout    |    3 +++
 dot.bash_profile   |    5 +++++
 dot.bashrc         |    9 +++++++++
 system.bash_logout |    3 +++
 6 files changed, 41 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-04 15:14:02 UTC (rev 104607)
+++ PKGBUILD	2011-01-04 15:30:53 UTC (rev 104608)
@@ -11,13 +11,16 @@
 license=('GPL')
 url="http://www.gnu.org/software/bash/bash.html"
 groups=('base')
-backup=(etc/skel/.bashrc etc/skel/.bash_profile)
+backup=(etc/bash.bash{rc,_logout} etc/skel/.bash{rc,_profile,_logout})
 depends=('readline>=6.1' 'glibc')
 provides=('sh')
 install=bash.install
 source=(http://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz
-        bashrc
-        system.bashrc)
+        dot.bashrc
+        dot.bash_profile
+        dot.bash_logout
+        system.bashrc
+        system.bash_logout)
 if [ $_patchlevel -gt 000 ]; then
     for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
         source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-$(printf "%03d" $p))
@@ -49,20 +52,28 @@
   cd ${srcdir}/${pkgname}-4.1
   make DESTDIR=${pkgdir} install
 
-  install -Dm644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc
-
   # for now, bash is our default /bin/sh
   cd ${pkgdir}/bin
   ln -s bash sh
 
-  mkdir -p ${pkgdir}/etc/skel/
-  install -D -m644 ${srcdir}/bashrc ${pkgdir}/etc/skel/.bashrc
-  echo ". \$HOME/.bashrc" >${pkgdir}/etc/skel/.bash_profile
+  install -dm755 ${pkgdir}/etc/skel/
+  
+  # system-wide configuration files
+  install -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc
+  install -m644 ${srcdir}/system.bash_logout ${pkgdir}/etc/bash.bash_logout
+  
+  # user configuration file skeletons
+  install -m644 ${srcdir}/dot.bashrc ${pkgdir}/etc/skel/.bashrc
+  install -m644 ${srcdir}/dot.bash_profile ${pkgdir}/etc/skel/.bash_profile
+  install -m644 ${srcdir}/dot.bash_logout ${pkgdir}/etc/skel/.bash_logout
 }
 
 md5sums=('9800d8724815fd84994d9be65ab5e7b8'
-         '3d2837e84645eac9bde399b58014bafa'
-         '196697769f1667a8a1aed608811129c6'
+         '027d6bd8f5f6a06b75bb7698cb478089'
+         '2902e0fee7a9168f3a4fd2ccd60ff047'
+         '42f4400ed2314bd7519c020d0187edc5'
+         '4f4757bd824e15bb88f3d651006f0dac'
+         '472f536d7c9e8250dc4568ec4cfaf294'
          '582dea5671b557f783e18629c2f77b68'
          '118d465095d4a4706eb1d34696a2666a'
          '120f7cf039a40d35fe375e59d6f17adc'

Deleted: bashrc
===================================================================
--- bashrc	2011-01-04 15:14:02 UTC (rev 104607)
+++ bashrc	2011-01-04 15:30:53 UTC (rev 104608)
@@ -1,5 +0,0 @@
-# If not running interactively, don't do anything
-[[ $- != *i* ]] && return
-
-alias ls='ls --color=auto'
-PS1='[\u@\h \W]\$ '

Added: dot.bash_logout
===================================================================
--- dot.bash_logout	                        (rev 0)
+++ dot.bash_logout	2011-01-04 15:30:53 UTC (rev 104608)
@@ -0,0 +1,3 @@
+#
+# ~/.bash_logout
+#

Added: dot.bash_profile
===================================================================
--- dot.bash_profile	                        (rev 0)
+++ dot.bash_profile	2011-01-04 15:30:53 UTC (rev 104608)
@@ -0,0 +1,5 @@
+#
+# ~/.bash_profile
+#
+
+[[ -f ~/.bashrc ]] && . ~/.bashrc

Copied: bash/trunk/dot.bashrc (from rev 104606, bash/trunk/bashrc)
===================================================================
--- dot.bashrc	                        (rev 0)
+++ dot.bashrc	2011-01-04 15:30:53 UTC (rev 104608)
@@ -0,0 +1,9 @@
+#
+# ~/.bashrc
+#
+
+# If not running interactively, don't do anything
+[[ $- != *i* ]] && return
+
+alias ls='ls --color=auto'
+PS1='[\u@\h \W]\$ '

Added: system.bash_logout
===================================================================
--- system.bash_logout	                        (rev 0)
+++ system.bash_logout	2011-01-04 15:30:53 UTC (rev 104608)
@@ -0,0 +1,3 @@
+#
+# /etc/bash.bash_logout
+#