add install-info presence test to install script

This commit is contained in:
Allan McRae 2010-04-18 13:32:16 +00:00
parent ee06b8c3e7
commit 552a359c45
2 changed files with 10 additions and 15 deletions

View File

@ -2,7 +2,7 @@
pkgname=grub pkgname=grub
pkgver=0.97 pkgver=0.97
pkgrel=16 pkgrel=17
pkgdesc="A GNU multiboot boot loader" pkgdesc="A GNU multiboot boot loader"
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
license=('GPL') license=('GPL')
@ -74,9 +74,6 @@ build() {
make DESTDIR=$pkgdir install || return 1 make DESTDIR=$pkgdir install || return 1
install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst install -D -m644 ../menu.lst $startdir/pkg/boot/grub/menu.lst
install -D -m755 ../install-grub $startdir/pkg/sbin/install-grub 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 if [ "$DESTARCH" = "x86_64" ]; then
# fool makepkg into building a x86_64 package # fool makepkg into building a x86_64 package

View File

@ -1,22 +1,20 @@
info_dir=/usr/share/info infodir=/usr/share/info
info_files=(grub.info multiboot.info) filelist=(grub.info multiboot.info)
post_install() { post_install() {
for f in ${info_files[@]}; do [ -x usr/bin/install-info ] || return 0
install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null for file in ${filelist[@]}; do
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done done
} }
post_upgrade() { post_upgrade() {
post_install post_install $1
} }
pre_remove() { pre_remove() {
for f in ${info_files[@]}; do [ -x usr/bin/install-info ] || return 0
install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null for file in ${filelist[@]}; do
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done done
} }