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

[Allan McRae]

    Date: Sunday, April 18, 2010 @ 09:32:16
  Author: allan
Revision: 77844

upgpkg: grub 0.97-17
add install-info presence test to install script

Modified:
  grub/trunk/PKGBUILD
  grub/trunk/grub.install

--------------+
 PKGBUILD     |    5 +----
 grub.install |   20 +++++++++-----------
 2 files changed, 10 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-18 13:08:09 UTC (rev 77843)
+++ PKGBUILD	2010-04-18 13:32:16 UTC (rev 77844)
@@ -3,7 +3,7 @@
 
 pkgname=grub
 pkgver=0.97
-pkgrel=16
+pkgrel=17
 pkgdesc="A GNU multiboot boot loader"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -75,9 +75,6 @@
   make DESTDIR=$pkgdir install || return 1
   install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst
   install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub
- 
-  rm -f $pkgdir/usr/share/info/dir || return 1
-  gzip /$pkgdir/usr/share/info/*
 
   if [ "$DESTARCH" = "x86_64" ]; then
     # fool makepkg into building a x86_64 package

Modified: grub.install
===================================================================
--- grub.install	2010-04-18 13:08:09 UTC (rev 77843)
+++ grub.install	2010-04-18 13:32:16 UTC (rev 77844)
@@ -1,22 +1,20 @@
-info_dir=/usr/share/info
-info_files=(grub.info multiboot.info)
+infodir=/usr/share/info
+filelist=(grub.info multiboot.info)
 
 post_install() {
-  for f in ${info_files[@]}; do
-    install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
 
 post_upgrade() {
-        post_install
+  post_install $1
 }
 
 pre_remove() {
-  for f in ${info_files[@]}; do
-    install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
   done
 }
-
-
-
-