99af29af57ad35acbd405102709d5046bcb32097 hiram Wed May 11 09:10:22 2022 -0700 do not use -p option on the copy to make sure the files are always new refs #29371 diff --git src/hg/makeDb/doc/chm13v2.0/makefile src/hg/makeDb/doc/chm13v2.0/makefile index 7f880ae..0f3b5fc 100644 --- src/hg/makeDb/doc/chm13v2.0/makefile +++ src/hg/makeDb/doc/chm13v2.0/makefile @@ -24,36 +24,36 @@ html/GCA_009914755.4_T2T-CHM13v2.0.tanDups.html # files used to construct a useOneFile hub.txt hubTxt = hub/GCA_009914755.4_T2T-CHM13v2.0.hub.txt \ hub/GCA_009914755.4_T2T-CHM13v2.0.genomes.txt \ trackDb/GCA_009914755.4_T2T-CHM13v2.0.trackDb.txt alpha:: singleFileHub @printf "# setting up hub files for hgdownload-test staging\n" make stageFiles make test stageFiles: $(htmlFiles:%=%stageFiles) %stageFiles: @rm -f "${stageDir}/$*" - @cp --remove-destination -p "$*" "${stageDir}/$*" + @cp --remove-destination "$*" "${stageDir}/$*" # verify the hub is functioning OK on hgwdev/genome-test from hgdownload-test test: @printf "# verify hub is functioning from hgdownload-test.gi.ucsc.edu\n" - hubCheck -checkSettings "https://hgdownload-test.gi.ucsc.edu/hubs/GCA/009/914/755/GCA_009914755.4/hub.txt" + hubCheck "https://hgdownload-test.gi.ucsc.edu/hubs/GCA/009/914/755/GCA_009914755.4/hub.txt" @printf "hubCheck OK\n" @printf "track count: %d tracks via API list tracks\n" "`curl -L "https://genome-test.gi.ucsc.edu/list/tracks?genome=GCA_009914755.4;trackLeavesOnly=1;hubUrl=https://hgdownload-test.gi.ucsc.edu/hubs/GCA/009/914/755/GCA_009914755.4/hub.txt" 2> /dev/null | python -mjson.tool | egrep ": {$$" | tr -d '"' | sed -e 's/^ \+//; s/ {//;' | xargs echo | wc -w`" @printf "should be more than 70 tracks\n" # verify the hub is functioning OK from hgdownload.soe.ucsc.edu verify: @printf "# verify hub is functioning from hgdownload.soe.ucsc.edu\n" hubCheck "https://hgdownload.soe.ucsc.edu/hubs/GCA/009/914/755/GCA_009914755.4/hub.txt" @printf "hubCheck OK\n" @printf "track count: %d tracks via API list tracks\n" "`curl -L "https://apibeta.soe.ucsc.edu/list/tracks?genome=GCA_009914755.4;trackLeavesOnly=1;hubUrl=https://hgdownload-test.gi.ucsc.edu/hubs/GCA/009/914/755/GCA_009914755.4/hub.txt" 2> /dev/null | python -mjson.tool | egrep ": {$$" | tr -d '"' | sed -e 's/^ \+//; s/ {//;' | xargs echo | wc -w`" @printf "should be more than 70 tracks\n" # user must have login permissions as qateam to hgdownload verifyLogin: @@ -67,21 +67,21 @@ rsync --exclude="hub.txt" --exclude="download.hub.txt" --stats -a -L -P "${pushFromDir}/" "qateam@hgdownload.soe.ucsc.edu:${pushToDir}/" 2>&1 | grep -v "X11 forwarding request" || true rsync --stats -a -L -P "${pushFromDir}/download.hub.txt" "qateam@hgdownload.soe.ucsc.edu:${pushToDir}/hub.txt" 2>&1 | grep -v "X11 forwarding request" || true @printf "# successful rsync\n" 1>&2 make verify clean:: rm -f hub.txt singleFileHub: ${hubTxt} @rm -f hub.txt @grep -v genomesFile hub/${asmId}.hub.txt > hub.txt @printf "useOneFile on\n\n" >> hub.txt @grep -v trackDb hub/${asmId}.genomes.txt >> hub.txt @echo >> hub.txt @cat trackDb/${asmId}.trackDb.txt >> hub.txt - @cp --remove-destination -p hub.txt ${stageDir}/${asmId}.singleFile.hub.txt - @cp --remove-destination -p hub.txt ${stageDir}/${asmId}.download.hub.txt - @cp --remove-destination -p hub/${asmId}.groups.txt ${stageDir}/ - @cp --remove-destination -p hub/${asmId}.genomes.txt ${stageDir}/ - cp --remove-destination -p hub/${asmId}.hub.txt ${stageDir}/ + @cp --remove-destination hub.txt ${stageDir}/${asmId}.singleFile.hub.txt + @cp --remove-destination hub.txt ${stageDir}/${asmId}.download.hub.txt + @cp --remove-destination hub/${asmId}.groups.txt ${stageDir}/ + @cp --remove-destination hub/${asmId}.genomes.txt ${stageDir}/ + cp --remove-destination hub/${asmId}.hub.txt ${stageDir}/ @rm -f hub.txt