ecba53cfcf13a435e7935340a5ddb73737c5006d braney Fri Jan 22 14:55:31 2021 -0800 change the way we discover files on beta and the rr for the bigDataUrl check diff --git src/hg/makeDb/trackDb/loadTracks src/hg/makeDb/trackDb/loadTracks index 1e54af8..4f9f1c7 100755 --- src/hg/makeDb/trackDb/loadTracks +++ src/hg/makeDb/trackDb/loadTracks @@ -1,52 +1,52 @@ #!/bin/bash -e usage='loadTracks [options] trackDb hgFindSpec db0 ... options: -release=release -strict -raName=trackDb.ra - base name of ra file -grpSql=grp.sql - create a grp table using this sql file -sqlDir=../../lib - directory containg trackDb.sql and hgFindSpec.sql - -remoteLogin=user@machine - machine with /gbdb on it' + -gbdbList=user@machine - machine with /gbdb on it' UNAME_N=`uname -n` UNAME_N=${UNAME_N/.soe.ucsc.edu/} release='' settings='' local='' strict='' raName='' grpSql='' -remoteLogin='' +gbdbList='' sqlDir='../../lib' while [[ $1 == -* ]] ; do case $1 in -release=*) release=$(echo $1 | sed 's/-release=//') ;; -strict) strict=yes;; -settings) settings="yes";; -raName=*) raName=$(echo $1 | sed 's/-raName=//') ;; -grpSql=*) grpSql=$(echo $1 | sed 's/-grpSql=//') ;; -sqlDir=*) sqlDir=$(echo $1 | sed 's/-sqlDir=//') ;; - -remoteLogin=*) - remoteLogin=$(echo $1 | sed 's/-remoteLogin=//') ;; + -gbdbList=*) + gbdbList=$(echo $1 | sed 's/-gbdbList=//') ;; *) echo "invalid option: $1" >&2 exit 1 ;; esac shift done if [ $# -lt 3 ] ; then echo "wrong # args: $usage" >&2 exit 1 fi trackDb="$1"; shift hgFindSpec="$1" ; shift dbs="$@" @@ -84,32 +84,32 @@ fopts="$fopts -release=$release" qopts="$qopts -release=$release" fi if [ -n "$strict" ] ; then topts="$topts -strict" fopts="$fopts -strict" qopts="$qopts -strict" fi if [ -n "$settings" ] ; then topts="$topts -settings" fi if [ -n "$raName" ] ; then topts="$topts -raName=$raName" fopts="$fopts -raName=$raName" fi - if [ -n "$remoteLogin" ] ; then - topts="$topts -remoteLogin=$remoteLogin" + if [ -n "$gbdbList" ] ; then + topts="$topts -gbdbList=$gbdbList" fi # don't use set -x, since the autoload scripts e-mail stderr. local cmd="hgTrackDb $topts $org $db $trackDb ${sqlDir}/trackDb.sql ." echo $cmd eval $cmd cmd="tdbQuery $qopts 'select count(*) from $db' -root=`pwd`" echo $cmd eval $cmd cmd="hgFindSpec $fopts $org $db $hgFindSpec ${sqlDir}/hgFindSpec.sql ." echo $cmd eval $cmd if [ -z "$strict" -a -f $dbpath/description.html ] ; then if [ "X${UNAME_N}Y" = "XhgwdevY" ]; then