diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-08-21 09:16:53 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-08-21 09:16:53 +0000 |
| commit | 7e99c9b748f9f2abe776f5a3211f1cd05e4e7f15 (patch) | |
| tree | c13727346f7174593f1634f84635897a482cd9af /x11-apps | |
| parent | Whitespace (diff) | |
| download | gentoo-2-7e99c9b748f9f2abe776f5a3211f1cd05e4e7f15.tar.gz gentoo-2-7e99c9b748f9f2abe776f5a3211f1cd05e4e7f15.tar.bz2 gentoo-2-7e99c9b748f9f2abe776f5a3211f1cd05e4e7f15.zip | |
Fix initscript to be sh compilant. Per bug #238552.
(Portage version: 2.2_rc38/cvs/Linux i686)
Diffstat (limited to 'x11-apps')
| -rw-r--r-- | x11-apps/xfs/ChangeLog | 5 | ||||
| -rwxr-xr-x | x11-apps/xfs/files/xfs.start | 12 |
2 files changed, 10 insertions, 7 deletions
diff --git a/x11-apps/xfs/ChangeLog b/x11-apps/xfs/ChangeLog index 577660ad2d45..7d758d525cc2 100644 --- a/x11-apps/xfs/ChangeLog +++ b/x11-apps/xfs/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-apps/xfs # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.63 2009/06/28 17:56:55 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/ChangeLog,v 1.64 2009/08/21 09:16:53 scarabeus Exp $ + + 21 Aug 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/xfs.start: + Fix initscript to be sh compilant. Per bug #238552. *xfs-1.1.0-r1 (28 Jun 2009) diff --git a/x11-apps/xfs/files/xfs.start b/x11-apps/xfs/files/xfs.start index ca3b456548ce..51624d99f46f 100755 --- a/x11-apps/xfs/files/xfs.start +++ b/x11-apps/xfs/files/xfs.start @@ -2,7 +2,7 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 # Author: Martin Schlemmer <azarah@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.4 2008/04/17 04:23:44 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xfs/files/xfs.start,v 1.5 2009/08/21 09:16:52 scarabeus Exp $ #NB: Config is in /etc/conf.d/xfs @@ -238,7 +238,7 @@ setup_font_dirs() { # NOTE: ttmkfdir does NOT work on type1 fonts (#53753) # Also, there is no way to regenerate Speedo/CID fonts.scale # <spyderous@gentoo.org> 2 August 2004 - if [ "${x/encodings}" = "${x}" -a \ + if [ "${x%*encodings*}" = "${x}" -a \ -n "$(find ${x} -iname '*.tt[cf]' -print)" ] then /usr/bin/ttmkfdir -x 2 \ @@ -254,7 +254,7 @@ setup_font_dirs() { fi # Next type1 and opentype (pfa,pfb,otf,otc) - elif [ "${x/encodings}" = "${x}" -a \ + elif [ "${x%*encodings*}" = "${x}" -a \ -n "$(find ${x} -iname '*.[po][ft][abcf]' -print)" ] then /usr/bin/mkfontscale \ @@ -263,7 +263,7 @@ setup_font_dirs() { fi # Now generate fonts.dir files ... - if [ "${x/encodings}" = "${x}" ] + if [ "${x%*encodings*}" = "${x}" ] then /usr/bin/mkfontdir \ -e /usr/share/fonts/encodings \ @@ -271,7 +271,7 @@ setup_font_dirs() { -- ${x} > /dev/null fi - if [ "${x/encodings}" = "${x}" -a -x /usr/bin/xftcache ] && \ + if [ "${x%*encodings*}" = "${x}" -a -x /usr/bin/xftcache ] && \ [ -n "$(find ${x} -iname '*.[otps][pft][cfad]' -print)" ] then # xftcache is broken, but run it anyhow ... @@ -313,7 +313,7 @@ start() { # See discussion at http://freedesktop.org/bugzilla/show_bug.cgi?id=306 rm -rf /tmp/.font-unix mkdir -m 1777 /tmp/.font-unix - ((sanity+=1)) + sanity=$((sanity+1)) if [ ${sanity} -gt 1000 ] ; then eend 1 "i give up" return 1 |