Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

install scripts: succeed even if info isn't installed

Browse Source 
A number of install scripts were testing for install-info to no effect,
then calling it regardless. For minimal installs, this makes pacman fail
on them visibly.

This fix replicates what other MSYS2 packages, e.g. autoconf, do.
Also none of these packages actually depend on GNU info.
This commit is contained in:
Andrew Chadwick 2016-06-01 15:53:56 +01:00
parent e1580abd55
commit 38f70672b9
18 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bash/PKGBUILD
View File

@ -6,7 +6,7 @@ pkgname=('bash' 'bash-devel')
_basever=4.3
_patchlevel=042 #prepare for some patches
pkgver=${_basever}.${_patchlevel}
pkgrel=4
pkgrel=5
pkgdesc="The GNU Bourne Again shell"
arch=('i686' 'x86_64')
license=('GPL')

4
bash/bash.install
View File

@ -2,14 +2,14 @@ info_dir=usr/share/info
info_files=bash.info
post_upgrade() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for f in ${info_files}; do
usr/bin/install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
done
}
pre_remove() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for f in ${info_files}; do
usr/bin/install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
done

2
coreutils/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=coreutils
pkgver=8.25
pkgrel=1
pkgrel=2
pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system"
arch=('i686' 'x86_64')
license=('GPL3')

4
coreutils/coreutils.install
View File

@ -2,7 +2,7 @@ infodir=usr/share/info
file=coreutils.info
post_install() {
[[ -x usr/bin/install-info ]]
[[ -x usr/bin/install-info ]] || return 0
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
}
@ -11,7 +11,7 @@ post_upgrade() {
}
pre_remove() {
[[ -x usr/bin/install-info ]]
[[ -x usr/bin/install-info ]] || return 0
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
}

2
findutils/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=findutils
pkgver=4.6.0
pkgrel=1
pkgrel=2
pkgdesc="GNU utilities to locate files"
arch=('i686' 'x86_64')
license=('GPL3')

4
findutils/findutils.install
View File

@ -2,7 +2,7 @@ infodir=/usr/share/info
filelist="find-maint.info find.info"
post_install() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done
@ -13,7 +13,7 @@ post_upgrade() {
}
pre_remove() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done

2
gettext/PKGBUILD
View File

@ -3,7 +3,7 @@
pkgbase=gettext
pkgname=('gettext' 'gettext-devel' 'libgettextpo' 'libasprintf' 'libintl')
pkgver=0.19.7
pkgrel=3
pkgrel=4
pkgdesc="GNU internationalization library"
arch=('i686' 'x86_64')
url="https://www.gnu.org/software/gettext/"

4
gettext/gettext.install
View File

@ -2,7 +2,7 @@ infodir=usr/share/info
filelist="gettext.info.gz autosprintf.info.gz"
post_install() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info $infodir/$file $infodir/dir 2> /dev/null
done
@ -13,7 +13,7 @@ post_upgrade() {
}
pre_remove() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
done

2
git/PKGBUILD
View File

@ -3,7 +3,7 @@
pkgname=git
pkgver=2.8.2
pkgrel=1
pkgrel=2
pkgdesc="The fast distributed version control system"
arch=('i686' 'x86_64')
url="https://git-scm.com/"

4
git/git.install
View File

@ -2,7 +2,7 @@ infodir=usr/share/info
filelist="git.info.gz gitman.info.gz"
post_install() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info $infodir/$file $infodir/dir 2> /dev/null
done
@ -13,7 +13,7 @@ post_upgrade() {
}
pre_remove() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info --delete $infodir/$file $infodir/dir 2> /dev/null
done

2
gmp/PKGBUILD
View File

@ -3,7 +3,7 @@
pkgbase=gmp
pkgname=('gmp' 'gmp-devel')
pkgver=6.1.0
pkgrel=2
pkgrel=3
pkgdesc="A free library for arbitrary precision arithmetic"
groups=('libraries')
arch=('i686' 'x86_64')

4
gmp/gmp.install
View File

@ -2,7 +2,7 @@ info_dir=usr/share/info
info_files="gmp.info gmp.info-1 gmp.info-2"
post_install() {
[ -x usr/bin/install-info ]
[ -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
done
@ -13,7 +13,7 @@ post_upgrade() {
}
pre_remove() {
[ -x usr/bin/install-info ]
[ -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
done

2
mpc/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=('mpc' 'mpc-devel')
pkgver=1.0.3
pkgrel=1
pkgrel=2
pkgdesc='Multiple precision complex arithmetic library'
groups=('libraries')
url='http://www.multiprecision.org'

4
mpc/mpc.install
View File

@ -2,7 +2,7 @@ info_dir=usr/share/info
info_files=mpc.info
post_install() {
[ -x usr/bin/install-info ]
[ -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
done
@ -13,7 +13,7 @@ post_upgrade() {
}
pre_remove() {
[ -x usr/bin/install-info ]
[ -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
done

2
mpfr/PKGBUILD
View File

@ -8,7 +8,7 @@ if [ -n "${_patchlevel}" ]; then
pkgver+=.${_patchlevel}
fi
#pkgver=${_pkgver}
pkgrel=1
pkgrel=2
pkgdesc="Multiple-precision floating-point library"
arch=('i686' 'x86_64')
url="http://www.mpfr.org/"

4
mpfr/mpfr.install
View File

@ -2,7 +2,7 @@ info_dir=usr/share/info
info_files=mpfr.info
post_install() {
[ -x usr/bin/install-info ]
[ -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
done
@ -13,7 +13,7 @@ post_upgrade() {
}
pre_remove() {
[ -x usr/bin/install-info ]
[ -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
done

2
readline/PKGBUILD
View File

@ -5,7 +5,7 @@ pkgname=('libreadline' 'libreadline-devel')
_basever=6.3
_patchlevel=008 #prepare for some patches
pkgver=${_basever}.${_patchlevel}
pkgrel=7
pkgrel=8
pkgdesc="GNU readline library"
arch=('i686' 'x86_64')
url="http://tiswww.case.edu/php/chet/readline/rltop.html"

4
readline/readline.install
View File

@ -2,14 +2,14 @@ infodir=usr/share/info
filelist="history.info readline.info rluserman.info"
post_upgrade() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
done
}
pre_remove() {
[ -x usr/bin/install-info ]
[ -x usr/bin/install-info ] || return 0
for file in ${filelist}; do
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
done