730f1cb766d7ab79175fc0c27f88e8139cdb9a60 hiram Fri Sep 20 12:05:47 2024 -0700 customized text for index page on BRC project (these custom headers should instead be header.html in the project source directories) and now sending out assemblyList.json file refs #34337 diff --git src/hg/makeDb/doc/asmHubs/asmHubs.mk src/hg/makeDb/doc/asmHubs/asmHubs.mk index f88522f..fbc6e81 100644 --- src/hg/makeDb/doc/asmHubs/asmHubs.mk +++ src/hg/makeDb/doc/asmHubs/asmHubs.mk @@ -35,56 +35,59 @@ cut -d'_' -f1-2 ${orderList} | sort | uniq -c | awk '$$1 > 1'; \ exit 255; \ fi sshKeyDownload: ssh -o PasswordAuthentication=no qateam@${downloadDest1} date ssh -o PasswordAuthentication=no qateam@${downloadDest2} date sshKeyDynablat: ssh -o PasswordAuthentication=no qateam@dynablat-01 date sshKeyCheck: sshKeyDownload sshKeyDynablat @printf "# ssh keys to hgdownload and dynablat-01 are good\n" mkJson:: - ${toolsDir}/tsvToJson.py ${orderList} > ${destDir}/assembly.list.json 2> ${name}.jsonData.txt + ${toolsDir}/tsvToJson.py ${orderList} > ${destDir}/assemblyList.json 2> ${name}.jsonData.txt # mkGenomes needs symLinks to run before mkGenomes runs, and then # the second symLinks after mkGenomes uses business created by mkGenomes mkGenomes:: @printf "# starting mkGenomes " 1>&2 ${toolsDir}/mkSymLinks.pl ${orderList} @date "+%s %F %T" 1>&2 @rm -f hasChainNets.txt ${toolsDir}/mkGenomes.pl dynablat-01 4040 ${orderList} > ${destDir}/${genomesTxt}.txt rm -f ${destDir}/download.${genomesTxt}.txt cp -p ${destDir}/${genomesTxt}.txt ${destDir}/download.${genomesTxt}.txt @printf "# finished mkGenomes " 1>&2 @date "+%s %F %T" 1>&2 symLinks:: ${toolsDir}/mkSymLinks.pl ${orderList} @[ -d ${hubsDownload} ] && true || mkdir ${hubsDownload} @for html in ${indexName} ${statsName} ${dataName} ; do \ [ -L ${hubsDownload}/$${html}.html ] && true || ln -s ${asmHubSrc}/$${html}.html ${hubsDownload} ; \ [ -L ${hubsDownload}/download.$${html}.html ] && true || ln -s ${asmHubSrc}/download.$${html}.html ${hubsDownload} ; \ done @for txt in groups hub genomes download.genomes ; do \ [ -L ${hubsDownload}/$${txt}.txt ] && true || ln -s ${asmHubSrc}/$${txt}.txt ${hubsDownload} ; \ done + @for json in assemblyList ; do \ +[ -L ${hubsDownload}/$${json}.json ] && true || ln -s ${asmHubSrc}/$${json}.json ${hubsDownload} ; \ +done hubIndex:: rm -f ${destDir}/${testIndexName}.html ${destDir}/${indexName}.html ${destDir}/download.${indexName}.html ${toolsDir}/mkHubIndex.pl ${Name} ${name} ${defaultAssembly} ${orderList} | sed -e 's#${name}/hub.txt#${name}/${hubFile}.txt#;' > ${destDir}/download.${indexName}.html sed -e "s#genome.ucsc.edu/h/#genome-test.gi.ucsc.edu/h/#g; s/hgdownload.soe/hgdownload-test.gi/g; s#genome.ucsc.edu#genome-test.gi.ucsc.edu#;" ${destDir}/download.${indexName}.html > ${destDir}/${indexName}.html chmod +x ${destDir}/${indexName}.html ${destDir}/download.${indexName}.html asmStats:: rm -f ${destDir}/download.${statsName}.html ${destDir}/${statsName}.html ${destDir}/${testStatsName}.html ${toolsDir}/mkAsmStats.pl ${Name} ${name} ${orderList} > ${destDir}/download.${statsName}.html sed -e "s#genome.ucsc.edu/h/#genome-test.gi.ucsc.edu/h/#g; s/hgdownload.soe/hgdownload-test.gi/g;" ${destDir}/download.${statsName}.html > ${destDir}/${statsName}.html chmod +x ${destDir}/${statsName}.html ${destDir}/download.${statsName}.html # trackData makes different tables for the test vs. production version # mkHubIndex.pl and mkAsmStats.pl should do this too . . . TBD @@ -110,30 +113,36 @@ clean:: rm -f ${destDir}/${hubFile}.txt rm -f ${destDir}/${testHubFile}.txt rm -f ${destDir}/groups.txt rm -f ${destDir}/${genomesTxt}.txt rm -f ${destDir}/${indexName}.html rm -f ${destDir}/${testIndexName}.html rm -f ${destDir}/${statsName}.html rm -f ${destDir}/${testStatsName}.html sendDownload:: sshKeyCheck ${toolsDir}/mkSendList.pl ${orderList} | while read F; do \ ${toolsDir}/sendToHgdownload.sh $$F < /dev/null; done rsync -L -a -P \ + /usr/local/apache/htdocs-hgdownload/hubs/${name}/assemblyList.json \ + qateam@${downloadDest1}:/mirrordata/hubs/${name}/ + rsync -L -a -P \ + /usr/local/apache/htdocs-hgdownload/hubs/${name}/assemblyList.json \ + qateam@${downloadDest2}:/mirrordata/hubs/${name}/ + rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/groups.txt \ qateam@${downloadDest1}:/mirrordata/hubs/${name}/ rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/groups.txt \ qateam@${downloadDest2}:/mirrordata/hubs/${name}/ rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/${hubFile}.txt \ qateam@${downloadDest1}:/mirrordata/hubs/${name}/ rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/${hubFile}.txt \ qateam@${downloadDest2}:/mirrordata/hubs/${name}/ rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${indexName}.html \ qateam@${downloadDest1}:/mirrordata/hubs/${name}/${indexName}.html rsync -L -a -P \ @@ -158,30 +167,36 @@ /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${genomesTxt}.txt \ qateam@${downloadDest2}:/mirrordata/hubs/${name}/${genomesTxt}.txt verifyTestDownload: ${toolsDir}/verifyOnDownload.sh api-test.gi.ucsc.edu ${orderList} verifyDownload: ${toolsDir}/verifyOnDownload.sh apibeta.soe.ucsc.edu ${orderList} verifyDynamicBlat: grep -v "^#" ${orderList} | cut -d'_' -f1-2 | while read asmId; do \ ${toolsDir}/testDynBlat.sh $$asmId < /dev/null; done sendIndexes:: rsync -L -a -P \ + /usr/local/apache/htdocs-hgdownload/hubs/${name}/assemblyList.json \ + qateam@${downloadDest1}:/mirrordata/hubs/${name}/ + rsync -L -a -P \ + /usr/local/apache/htdocs-hgdownload/hubs/${name}/assemblyList.json \ + qateam@${downloadDest2}:/mirrordata/hubs/${name}/ + rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${indexName}.html \ qateam@${downloadDest1}:/mirrordata/hubs/${name}/${indexName}.html rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${indexName}.html \ qateam@${downloadDest2}:/mirrordata/hubs/${name}/${indexName}.html rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${statsName}.html \ qateam@${downloadDest1}:/mirrordata/hubs/${name}/${statsName}.html rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${statsName}.html \ qateam@${downloadDest2}:/mirrordata/hubs/${name}/${statsName}.html rsync -L -a -P \ /usr/local/apache/htdocs-hgdownload/hubs/${name}/download.${dataName}.html \ qateam@${downloadDest1}:/mirrordata/hubs/${name}/${dataName}.html rsync -L -a -P \