From 498e564e849097e58c1afa63017bec5f46f179d4 Mon Sep 17 00:00:00 2001 From: William S Fulton Date: Sat, 12 Nov 2011 00:10:40 +0000 Subject: [PATCH] Fix pcre-build.sh to work with non-compressed tarballs git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12836 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- CHANGES.current | 3 +++ Tools/pcre-build.sh | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.current b/CHANGES.current index db12bd864..7de2131e2 100644 --- a/CHANGES.current +++ b/CHANGES.current @@ -5,6 +5,9 @@ See the RELEASENOTES file for a summary of changes in each release. Version 2.0.5 (in progress) =========================== +2011-11-11: wsfulton + Fix pcre-build.sh to work with non-compressed tarballs - problem reported by Adrian Blakely. + 2011-11-04: szager [python] Bug 3429388: python unsigned integer handling on 32-bit architectures. diff --git a/Tools/pcre-build.sh b/Tools/pcre-build.sh index 876a58a7e..2d991ceba 100755 --- a/Tools/pcre-build.sh +++ b/Tools/pcre-build.sh @@ -36,8 +36,9 @@ fi echo "Looking for PCRE tarball..." rm -rf pcre -pcre_tarball=`ls pcre-*.tar.*` -test -f "$pcre_tarball" || bail "Could not find tarball" +pcre_tarball=`ls pcre-*.tar*` +test -n "$pcre_tarball" || bail "Could not find tarball matching pattern: pcre-*.tar*" +test -f "$pcre_tarball" || bail "Could not find a single PCRE tarball. Found: $pcre_tarball" echo "Extracting tarball: $pcre_tarball" tar -xf $pcre_tarball || bail "Could not untar $pcre_tarball"