Mercurial > hg > aboriginal
changeset 255:c3e8c6662b58
Fix include.sh to consistently use noversion, and rephrase the sed invocation
in noversion to not need -r (which makes building on MacOS X easier).
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Tue, 01 Jan 2008 15:03:11 -0600 |
| parents | e005f4279b36 |
| children | e1d156c264bc |
| files | include.sh |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/include.sh Tue Jan 01 03:12:59 2008 -0600 +++ b/include.sh Tue Jan 01 15:03:11 2008 -0600 @@ -4,7 +4,7 @@ function noversion() { - echo "$1" | sed -r -e 's/-*([0-9\.]|[_-]rc|-pre|[0-9][a-zA-Z])*(\.tar\..z2*)$/\2/' + echo "$1" | sed -e 's/-*\([0-9\.]|[_-]rc|-pre|[0-9][a-zA-Z]\)*\(\.tar\..z2*\)$/\2/' } # output the sha1sum of a file @@ -87,7 +87,7 @@ function download() { FILENAME=`echo "$URL" | sed 's .*/ '` - BASENAME=`echo "$FILENAME" | sed -r -e 's/-*([0-9\.]|[_-]rc|-pre|[0-9][a-zA-Z])*(\.tar\..z2*)$/\2/'` + BASENAME=`noversion "$FILENAME"` # The extra "" is so we test the sha1sum after the last download.