Author: jfrederic.clere(a)jboss.com Date: 2013-06-13 13:25:26 -0400 (Thu, 13 Jun 2013) New Revision: 3120 Modified: trunk/build/unix/util/applypatch.sh Log: arrange logic. Modified: trunk/build/unix/util/applypatch.sh =================================================================== --- trunk/build/unix/util/applypatch.sh 2013-06-13 15:29:53 UTC (rev 3119) +++ trunk/build/unix/util/applypatch.sh 2013-06-13 17:25:26 UTC (rev 3120) @@ -45,9 +45,9 @@ if $xbap_is_rhel; then filename=$basefilename.rhel.patch else + dist="" + ver="" if [ $BUILD_SYS = "linux2" ]; then - dist="" - ver="" if [ -f /etc/redhat-release ]; then dist=RedHatEnterpriseES grep "release 4" /etc/redhat-release @@ -58,19 +58,20 @@ if [ $? -eq 0 ]; then ver=4 fi - box_name=`uname -n` - if [ $box_name = "dev92.mw.lab.eng.bos.redhat.com" ]; then - dist=RedHatEnterpriseES - ver=4 - fi fi # lsb_release is not always installed :-( #dist=`lsb_release -i -s` #ver=`lsb_release -r -s` - if [ -f $xbap_build_top/../patch/$basefilename.$dist.$ver.patch ]; then - filename=$basefilename.$dist.$ver.patch - fi fi + # Hack for old libtool :-( + box_name=`uname -n` + if [ $box_name = "dev92.mw.lab.eng.bos.redhat.com" ]; then + dist=RedHatEnterpriseES + ver=4 + fi + if [ -f $xbap_build_top/../patch/$basefilename.$dist.$ver.patch ]; then + filename=$basefilename.$dist.$ver.patch + fi fi if [ -f $xbap_build_top/../patch/$filename ]; then (cd $xbap_package_dir