87d8340f2b3cdce33de9043c4ecd9afdfef55b25 angie Wed Oct 4 17:48:43 2023 -0700 Set prevDate at the beginning so we don't run into trouble for occasional epic long downloads from CNCB. diff --git src/hg/utils/otto/sarscov2phylo/updatePublic.sh src/hg/utils/otto/sarscov2phylo/updatePublic.sh index bd3c79c..3d71b94 100755 --- src/hg/utils/otto/sarscov2phylo/updatePublic.sh +++ src/hg/utils/otto/sarscov2phylo/updatePublic.sh @@ -8,56 +8,56 @@ usage() { echo "usage: $0 problematicSitesVcf" } if [ $# != 1 ]; then usage exit 1 fi problematicSitesVcf=$1 ottoDir=/hive/data/outside/otto/sarscov2phylo gisaidDir=/hive/users/angie/gisaid today=$(date +%F) +prevDate=$(date -d yesterday +%F) scriptDir=$(dirname "${BASH_SOURCE[0]}") $scriptDir/gisaidFromChunks.sh & cogUkDir=$ottoDir/cogUk.$today mkdir -p $cogUkDir cd $cogUkDir && time $scriptDir/getCogUk.sh >& getCogUk.log & ncbiDir=$ottoDir/ncbi.$today mkdir -p $ncbiDir cd $ncbiDir && time $scriptDir/getNcbi.sh >& getNcbi.log & cncbDir=$ottoDir/cncb.$today mkdir -p $cncbDir cd $cncbDir && time $scriptDir/getCncb.sh >& getCncb.log & wait time $scriptDir/updateIdMapping.sh \ $gisaidDir/{metadata_batch_$today.tsv.gz,sequences_batch_$today.fa.xz} buildDir=$ottoDir/$today mkdir -p $buildDir cd $buildDir -prevDate=$(date -d yesterday +%F) time $scriptDir/updateCombinedTree.sh $prevDate $today $problematicSitesVcf \ >& updateCombinedTree.log echo "" cat hgPhyloPlace.description.txt cat hgPhyloPlace.plusGisaid.description.txt set +o pipefail grep skip annotate.pango annotate.nextclade | cat grep 'Could not' annotate.pango annotate.nextclade | cat # Check for newly added lineages that are missing from pango.clade-mutations.tsv set +x lineages=~angie/github/pango-designation/lineages.csv tail -n+2 $lineages | cut -d, -f 2 | uniq | grep -E '^(AY|[B-Z][A-Z])' | sort -u \