[arch-commits] Commit in bash/trunk (PKGBUILD bash.install)

[Aaron Griffin]

    Date: Wednesday, January 28, 2009 @ 14:32:04
  Author: aaron
Revision: 25769

upgpkg: bash 3.2.048-3
    Only run install-info if binary is present. Fix core dep-cycles

Modified:
  bash/trunk/PKGBUILD
  bash/trunk/bash.install

--------------+
 PKGBUILD     |    2 +-
 bash.install |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-28 18:56:08 UTC (rev 25768)
+++ PKGBUILD	2009-01-28 19:32:04 UTC (rev 25769)
@@ -4,7 +4,7 @@
 pkgname=bash
 _patchlevel=048
 pkgver=3.2.$_patchlevel
-pkgrel=2
+pkgrel=3
 pkgdesc="The GNU Bourne Again shell"
 arch=(i686 x86_64)
 license=('GPL')

Modified: bash.install
===================================================================
--- bash.install	2009-01-28 18:56:08 UTC (rev 25768)
+++ bash.install	2009-01-28 19:32:04 UTC (rev 25769)
@@ -2,8 +2,9 @@
 info_files=(bash.info)
 
 post_install() {
+  [ -x usr/bin/install-info ] || return 0
   for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+    usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
 }
 
@@ -12,8 +13,9 @@
 }
 
 pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
   for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+    usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
   done
 }
 # vim:set ts=2 sw=2 et: