Index: releases/bedework-3.8/build/quickstart/linux/bw =================================================================== --- releases/bedework-3.8/build/quickstart/linux/bw (revision 3353) +++ releases/bedework-3.8/build/quickstart/linux/bw (revision 3359) @@ -162,7 +162,15 @@ usageZoneinfo() { echo "" + echo "$PRG -zoneinfo -fetch" + echo "to have data fetched and processed. Alternatively to process a specifi set of data" echo "$PRG -zoneinfo -version VERSION -tzdata path-to-data" echo "for example:" echo "$PRG -zoneinfo -version 2010m -tzdata /data/olson/tzdata2010m.tar.gz" + echo "" + echo "The data can be obtained manually in the following manner:" + echo " wget 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz'" + echo "" + echo "The version is the '*' part of the name" + exit 1 } @@ -304,33 +312,53 @@ bwresources="$bwtzsvr/resources" - shift - - if [ "$1" != "-version" ] ; then - echo "got $1" - echo "Must supply -version parameter for -zoneinfo" - usageZoneinfo - fi - - shift - echo "got $1" -# version="-Dorg.bedework.timezones.version=$1" - version=$1 - shift - - if [ "$1" != "-tzdata" ] ; then - echo "Must supply -tzdata parameter for -zoneinfo" - usageZoneinfo - fi - - shift -# tzdata="-Dorg.bedework.timezones.data=$1" - tzdata=$1 - shift - rm -rf /tmp/bedework mkdir /tmp/bedework mkdir /tmp/bedework/timezones + mkdir /tmp/bedework/timezones/data cd /tmp/bedework/timezones + + shift + + if [ "$1" = "-fetch" ] ; then + shift + cd data + wget 'ftp://elsie.nci.nih.gov/pub/tz*.tar.gz' + gzip -dc tzdata*.tar.gz | tar -xf - + + filename=$(basename `ls tzdata*`) + version=$( echo $filename | cut -c 7-11 ) + + tzdata="/tmp/bedework/timezones/data/$filename" + + cd .. + + echo version=$version + echo tzdata=$tzdata + else + if [ "$1" != "-version" ] ; then + echo "got $1" + echo "Must supply -version parameter for -zoneinfo" + usageZoneinfo + fi + + shift + + echo "got $1" + version=$1 + + shift + + if [ "$1" != "-tzdata" ] ; then + echo "Must supply -tzdata parameter for -zoneinfo" + usageZoneinfo + fi + + shift + + tzdata=$1 + + shift + fi wget http://bedework.org/downloads/lib/vzic-1.3.tgz @@ -381,5 +409,5 @@ echo "" echo "------------------------------------------------------------------------------" - echo "tzdata.zip has been built and is at $bwtzsvr/tzdata.zip" + echo "tzdata.zip has been built and is at $bwtzsvr/dist/tzdata.zip" echo "------------------------------------------------------------------------------" echo "" @@ -505,5 +533,5 @@ ;; # ------------------------Special targets - deploylog4j) + deploylog4j) deploylog4j="yes" pkgdefault=