Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8a6e612d78813024bcf1568c3bb35629320b4f7
commit b8a6e612d78813024bcf1568c3bb35629320b4f7 Author: crazy <cr...@frugalware.org> Date: Tue Oct 31 12:47:07 2017 +0100 ccache-3.3.4-2-x86_64 * replace grepping for group with getent in install file * use local vars and Fexec in build() diff --git a/source/devel-extra/ccache/FrugalBuild b/source/devel-extra/ccache/FrugalBuild index 6f7965c..fd0938a 100644 --- a/source/devel-extra/ccache/FrugalBuild +++ b/source/devel-extra/ccache/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ccache pkgver=3.3.4 -pkgrel=1 +pkgrel=2 pkgdesc="A fast compiler cache" url="http://ccache.samba.org/"; depends=('glibc') @@ -15,13 +15,16 @@ source=(http://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz \ signatures=("${source[0]}.asc" '') build() { - Fbuild - Fmkdir /usr/lib/ccache/bin + + Fbuild + Fmkdir /usr/lib/ccache/bin + + local i for i in {$CHOST-,}{cc,c++,gcc,g++} clang clang++ do Fln /usr/bin/ccache /usr/lib/ccache/bin/$i done - install -d -m 2775 -g 48 $Fdestdir/var/cache/ccache/ || Fdie + Fexec install -d -m 2775 -g 48 $Fdestdir/var/cache/ccache/ || Fdie Fdoc README.Frugalware } diff --git a/source/devel-extra/ccache/ccache.install b/source/devel-extra/ccache/ccache.install index 09340de..bbe7281 100644 --- a/source/devel-extra/ccache/ccache.install +++ b/source/devel-extra/ccache/ccache.install @@ -1,17 +1,18 @@ post_install() { - if ! grep -q '^ccache:' /etc/group ; then - groupadd -g 48 ccache - fi + + /usr/bin/getent group ccache > /dev/null 2>&1 || /usr/sbin/groupadd -g 48 ccache + } post_upgrade() { - post_install $1 + post_install } pre_remove() { - groupdel ccache + + /usr/bin/getent group ccache > /dev/null 2>&1 || /usr/sbin/groupdel ccache } op=$1 _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
