[arch-commits] Commit in xpdf-chinese-traditional/trunk (2 files)

[Gaetan Bisson]

    Date: Wednesday, November 10, 2010 @ 16:52:38
  Author: bisson
Revision: 98521

- fixes FS#21654
- safer (IMHO), in-place install file

Modified:
  xpdf-chinese-traditional/trunk/PKGBUILD
  xpdf-chinese-traditional/trunk/xpdf-chinese-traditional.install

----------------------------------+
 PKGBUILD                         |   24 +++++++++++++-----------
 xpdf-chinese-traditional.install |   25 +++----------------------
 2 files changed, 16 insertions(+), 33 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-10 20:07:53 UTC (rev 98520)
+++ PKGBUILD	2010-11-10 21:52:38 UTC (rev 98521)
@@ -4,21 +4,23 @@
 
 pkgname=xpdf-chinese-traditional
 pkgver=20040727
-pkgrel=4
-pkgdesc="Adds support for traditional Chinese fonts to xpdf"
+pkgrel=5
+pkgdesc='Adds support for traditional Chinese fonts to xpdf'
 arch=('any')
-url="http://www.foolabs.com/xpdf/"
+url='http://www.foolabs.com/xpdf/'
 license=('GPL2' 'custom')
 depends=('xpdf')
 install=$pkgname.install
-source=(ftp://ftp.foolabs.com/pub/xpdf/$pkgname.tar.gz LICENSE)
-md5sums=('b7fa7f1850f7cfa28498701507079abb' 'c712b6980d92a9726e5f6638389189e0')
+source=("ftp://ftp.foolabs.com/pub/xpdf/$pkgname.tar.gz"
+        'LICENSE')
+md5sums=('b7fa7f1850f7cfa28498701507079abb'
+         'c712b6980d92a9726e5f6638389189e0')
 
 build() {
-  cd $srcdir/$pkgname
-  install -dm755 $pkgdir/usr/share/xpdf/CMap
-  install -m644 -t $pkgdir/usr/share/xpdf *.unicodeMap
-  install -m644 -t $pkgdir/usr/share/xpdf/CMap CMap/*
+  cd "$srcdir/$pkgname"
+  install -m755 -d "$pkgdir"/usr/share/xpdf/CMap
+  install -m644 -t "$pkgdir"/usr/share/xpdf *.{cidToUnicode,unicodeMap}
+  install -m644 -t "$pkgdir"/usr/share/xpdf/CMap CMap/*
 
   # relocate language specific files
   sed -i 's|/usr/local/share/xpdf/chinese-traditional|/usr/share/xpdf|' add-to-xpdfrc
@@ -29,6 +31,6 @@
 
 END_OF_RC_TWEAK
 
-  install -Dm644 add-to-xpdfrc $pkgdir/etc/xpdf/$pkgname
-  install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  install -Dm644 add-to-xpdfrc "$pkgdir/etc/xpdf/$pkgname"
+  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }

Modified: xpdf-chinese-traditional.install
===================================================================
--- xpdf-chinese-traditional.install	2010-11-10 20:07:53 UTC (rev 98520)
+++ xpdf-chinese-traditional.install	2010-11-10 21:52:38 UTC (rev 98521)
@@ -4,11 +4,8 @@
 _pkgname=xpdf-chinese-traditional
 
 post_install() {
- # we check if rc is already included in /etc/xpdfrc
-  echo "make $_pkgname config file known to global xpdf config ..."
-  cat etc/xpdfrc | grep -v /etc/xpdf/$_pkgname >/tmp/.pacxpdf
-  mv /tmp/.pacxpdf etc/xpdfrc
-  echo "include /etc/xpdf/$_pkgname" >> etc/xpdfrc
+  sed -i "/\/etc\/xpdf\/$_pkgname/d" etc/xpdfrc
+  sed -i "\$a include \/etc\/xpdf\/$_pkgname" etc/xpdfrc
   cat << EOM
 
 *******************************************************************************
@@ -23,22 +20,6 @@
 EOM
 }
 
-post_upgrade() {
-  post_install $1
-}
-
 pre_remove() {
-  cat etc/xpdfrc | grep -v /etc/xpdf/$_pkgname >/tmp/.pacxpdf
-  mv /tmp/.pacxpdf etc/xpdfrc
-  chmod 644 etc/xpdfrc
+  sed -i "/\/etc\/xpdf\/$_pkgname/d" etc/xpdfrc
 }
-
-post_remove() {
-  /bin/true
-}
-
-
-op=$1
-shift
-
-$op $*