0d28b81239a743f286ccc60328d0743a0fa9acbd angie Thu Feb 25 16:11:21 2021 -0800 Make public-latest.* links in archive directory and hgPhyloPlaceData. diff --git src/hg/utils/otto/sarscov2phylo/updatePublicTree.sh src/hg/utils/otto/sarscov2phylo/updatePublicTree.sh index ffbf6b3..7e26bbe 100755 --- src/hg/utils/otto/sarscov2phylo/updatePublicTree.sh +++ src/hg/utils/otto/sarscov2phylo/updatePublicTree.sh @@ -287,43 +287,61 @@ gzip -f public-$today.lineageColors public-$today.nextstrainColors #***TODO: make acknowledgements.tsv.gz! (see publicCredits.sh) ncbiDate=$(ls -l $ncbiDir | sed -re 's/.*ncbi\.([0-9]{4}-[0-9][0-9]-[0-9][0-9]).*/\1/') cogUkDate=$(ls -l $cogUkDir | sed -re 's/.*cogUk\.([0-9]{4}-[0-9][0-9]-[0-9][0-9]).*/\1/') cncbDate=$(ls -l $cncbDir | sed -re 's/.*cncb\.([0-9]{4}-[0-9][0-9]-[0-9][0-9]).*/\1/') if [ $ncbiDate == $cogUkDate ]; then echo "sarscov2phylo release 13-11-20; NCBI and COG-UK sequences downloaded $ncbiDate; CNCB sequences downloaded $cncbDate" \ > version.txt else echo "sarscov2phylo release 13-11-20; NCBI sequences downloaded $ncbiDate; COG-UK sequences downloaded $cogUkDate; CNCB sequences downloaded $cncbDate" \ > version.txt fi +sampleCountComma=$(echo $sampleCount \ + | sed -re 's/([0-9]+)([0-9]{3})$/\1,\2/; s/([0-9]+)([0-9]{3},[0-9]{3})$/\1,\2/;') +echo "$sampleCountComma genomes from GenBank, COG-UK and CNCB ($today); sarscov2phylo 13-11-20 tree with newer sequences added by UShER" \ + > hgPhyloPlace.description.txt + # Update gbdb links -- not every day, too much churn for getting releases out and the # tracks are getting unmanageably large for VCF. if false; then for f in public-$today.all{,.minAf*}.vcf.gz ; do t=$(echo $f | sed -re "s/-$today//;") ln -sf `pwd`/$f /gbdb/wuhCor1/sarsCov2PhyloPub/$t ln -sf `pwd`/$f.tbi /gbdb/wuhCor1/sarsCov2PhyloPub/$t.tbi done ln -sf `pwd`/public-$today.all.nwk /gbdb/wuhCor1/sarsCov2PhyloPub/public.all.nwk ln -sf `pwd`/public-$today.all.parsimony.bw \ /gbdb/wuhCor1/sarsCov2PhyloPub/public.all.parsimony.bw ln -sf `pwd`/public-$today.lineageColors.gz \ /gbdb/wuhCor1/sarsCov2PhyloPub/public.all.lineageColors.gz ln -sf `pwd`/public-$today.nextstrainColors.gz \ /gbdb/wuhCor1/sarsCov2PhyloPub/public.all.nextstrainColors.gz ln -sf `pwd`/version.txt /gbdb/wuhCor1/sarsCov2PhyloPub/public.all.version.txt fi # Link to public trees download directory hierarchy y=$(date +%Y) m=$(date +%m) d=$(date +%d) -archive=/hive/users/angie/publicTrees/$y/$m/$d +archiveRoot=/hive/users/angie/publicTrees +archive=$archiveRoot/$y/$m/$d mkdir -p $archive ln `pwd`/public-$today.all.nwk $archive/ ln `pwd`/public-$today.all.masked.{pb,vcf.gz} $archive/ ln `pwd`/public-$today.metadata.tsv.gz $archive/ +# Update 'latest' in $archiveRoot +ln -f `pwd`/public-$today.all.nwk $archiveRoot/public-latest.all.nwk +ln -f `pwd`/public-$today.all.masked.pb $archiveRoot/public-latest.all.masked.pb +ln -f `pwd`/public-$today.all.masked.vcf.gz $archiveRoot/public-latest.all.masked.vcf.gz +ln -f `pwd`/public-$today.metadata.tsv.gz $archiveRoot/public-latest.metadata.tsv.gz +ln -f `pwd`/hgPhyloPlace.description.txt $archiveRoot/public-latest.version.txt +# Update 'latest' protobuf, metadata and desc in and cgi-bin{,-angie}/hgPhyloPlaceData/wuhCor1/ +for dir in /usr/local/apache/cgi-bin{-angie,}/hgPhyloPlaceData/wuhCor1; do + ln -sf `pwd`/public-$today.all.masked.pb $dir/public-latest.all.masked.pb + ln -sf `pwd`/public-$today.metadata.tsv.gz $dir/public-latest.metadata.tsv.gz + ln -sf `pwd`/hgPhyloPlace.description.txt $dir/public-latest.version.txt +done