From 3640578ef3082f30d3287ee665c538998d621ec2 Mon Sep 17 00:00:00 2001
From: "Markus M. May" <mmay@javafreedom.org>
Date: Tue, 1 Dec 2009 21:43:38 +0100
Subject: [PATCH] Updated sonar, now i686 should work as well.

---
 sonar/PKGBUILD      | 57 ++++++++++++++++++++++++++++-------------------------
 sonar/sonar.install |  2 +-
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/sonar/PKGBUILD b/sonar/PKGBUILD
index 78cef12..c590d28 100644
--- a/sonar/PKGBUILD
+++ b/sonar/PKGBUILD
@@ -1,7 +1,7 @@
 #Contributor: Markus M. May <mmay AT javafreedom DOT org>
 pkgname=sonar
 pkgver=1.11.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A code quality management platform."
 url="http://sonar.codehaus.org"
 arch=('i686' 'x86_64')
@@ -14,12 +14,12 @@ backup=('etc/sonar/sonar.properties'
         'etc/sonar/wrapper.conf'
         'etc/sonar/logback.xml')
 
-install=$pkgname.install
+install=${pkgname}.install
 conflicts=('java-sonar')
 provides=('java-sonar' 'sonar')
-options=(!strip !docs)
+options=(!strip)
 
-source=(http://dist.sonar.codehaus.org/$pkgname-${pkgver}.zip
+source=(http://dist.sonar.codehaus.org/${pkgname}-${pkgver}.zip
         'sonar.sh'
         'wrapper.conf'
         'logback.xml')	
@@ -33,44 +33,47 @@ build() {
   cd ${srcdir}
 
   # Create directory and copy everything
-  install -d $pkgdir/opt/$pkgname
+  install -d ${pkgdir}/opt/${pkgname}
 
   # moving only $CARCH specific files to pkg, delete the rest
+  msg "Determine right architecture"
   if [ $CARCH = 'x86_64' ]; then
-    cp -r $srcdir/$pkgname-${pkgver}/bin/linux-x86-64 $pkgdir/opt/$pkgname/bin || return 1
-    rm -r $srcdir/$pkgname-${pkgver}/bin || return 1
-  elif [ $CARCH} = 'i686' ]; then
-    cp -r $srcdir/$pkgname-${pkgver}/bin/linux-x86-32 $pkgdir/opt/$pkgname/bin || return 1
-    rm -r $srcdir/$pkgname-${pkgver}/bin || return 1
+    cp -r ${srcdir}/${pkgname}-${pkgver}/bin/linux-x86-64 ${pkgdir}/opt/${pkgname}/bin || return 1
+    rm -r ${srcdir}/${pkgname}-${pkgver}/bin || return 1
+  elif [ $CARCH = 'i686' ]; then
+    cp -r ${srcdir}/${pkgname}-${pkgver}/bin/linux-x86-32 ${pkgdir}/opt/${pkgname}/bin || return 1
+    rm -r ${srcdir}/${pkgname}-${pkgver}/bin || return 1
   fi
 
   # delete unnecessary log file
-  #rm $pkgdir/opt/$pkgname/bin/wrapper.log
+  #rm ${pkgdir}/opt/${pkgname}/bin/wrapper.log
 
   # install the additional config files to the desired destination
-  mkdir -p $pkgdir/etc/$pkgname || return 1
-  install $srcdir/$pkgname-${pkgver}/conf/$pkgname.properties $pkgdir/etc/$pkgname/$pkgname.properties
-  install $srcdir/$pkgname-${pkgver}/conf/derby.properties $pkgdir/etc/$pkgname/derby.properties
-  install $srcdir/logback.xml $pkgdir/etc/$pkgname/logback.xml
-  install $srcdir/wrapper.conf $pkgdir/etc/$pkgname || return 1
-  rm -r $srcdir/$pkgname-$pkgver/conf
+  msg "Installing configuration files"
+  mkdir -p ${pkgdir}/etc/${pkgname} || return 1
+  install ${srcdir}/${pkgname}-${pkgver}/conf/${pkgname}.properties ${pkgdir}/etc/${pkgname}/${pkgname}.properties
+  install ${srcdir}/${pkgname}-${pkgver}/conf/derby.properties ${pkgdir}/etc/${pkgname}/derby.properties
+  install ${srcdir}/logback.xml ${pkgdir}/etc/${pkgname}/logback.xml
+  install ${srcdir}/wrapper.conf ${pkgdir}/etc/${pkgname} || return 1
+  rm -r ${srcdir}/${pkgname}-${pkgver}/conf
 
   # copy documentation
-  mkdir -p $pkgdir/usr/share/doc/$pkgname
-  install $srcdir/$pkgname-$pkgver/COPYING $pkgdir/usr/share/doc/$pkgname
-  rm $srcdir/$pkgname-$pkgver/COPYING
+  msg "Copy documentation"
+  mkdir -p ${pkgdir}/usr/share/doc/${pkgname}/
+  install ${srcdir}/${pkgname}-${pkgver}/COPYING ${pkgdir}/usr/share/doc/${pkgname}
+  rm ${srcdir}/${pkgname}-${pkgver}/COPYING
 
   # delete not needed directories
-  rm -r $srcdir/$pkgname-$pkgver/logs  
+  rm -r ${srcdir}/${pkgname}-${pkgver}/logs  
 
   # copy the source to the final directory
-  cp -a $srcdir/sonar-${pkgver}/* $pkgdir/opt/sonar || return 1
+  msg "Copy Source to final directory"
+  cp -a ${srcdir}/${pkgname}-${pkgver}/* ${pkgdir}/opt/${pkgname} || return 1
 
-  mkdir -p $pkgdir/etc/rc.d || return 1
-  install $srcdir/sonar.sh $pkgdir/opt/$pkgname/bin || return 1
+  install ${srcdir}/${pkgname}.sh ${pkgdir}/opt/${pkgname}/bin || return 1
 
-  mkdir -p $pkgdir/var/log/$pkgname/
-  touch $pkgdir/var/log/$pkgname/wrapper.log
+  mkdir -p ${pkgdir}/var/log/${pkgname}/
+  touch ${pkgdir}/var/log/${pkgname}/wrapper.log
 
-  install -m755 -d /var/run/$pkgname
+  install -m755 -d ${pkgdir}/var/run/${pkgname}
 }
diff --git a/sonar/sonar.install b/sonar/sonar.install
index 6ca7034..2332790 100644
--- a/sonar/sonar.install
+++ b/sonar/sonar.install
@@ -9,7 +9,7 @@ pre_install() {
 
 # arg 1:  the new package version
 post_install() {
-  ln -s /opt/sonar/sonar.sh /etc/rc.d/sonar
+  ln -s /opt/sonar/bin/sonar.sh /etc/rc.d/sonar
 
   echo ">>> Creating user and group and setting permissions..."
   getent group sonar > /dev/null || usr/sbin/groupadd sonar
-- 
2.11.4.GIT