3976a8ec6b27464bd64e93916821dbcb52cd7671 hiram Thu Apr 30 23:01:52 2026 -0700 this actually might be working all the way through now refs #31811 diff --git src/hg/utils/otto/userRequests/kegAlignLastz.sh src/hg/utils/otto/userRequests/kegAlignLastz.sh index b6a516901b3..5002da20730 100755 --- src/hg/utils/otto/userRequests/kegAlignLastz.sh +++ src/hg/utils/otto/userRequests/kegAlignLastz.sh @@ -541,31 +541,31 @@ fi ### skip primary alignment if it is already done ### primaryDone == 0 means NOT done yet if [ $primaryDone -eq 0 ]; then mkdir -p "${buildDir}" ### setup the DEF file printf "%s" "${defString}" > ${buildDir}/DEF ### and the yaml file printf "%s" "${yamlString}" > ${buildDir}/${tAccId}.${qAccId}.yaml ### setup the buildDir/lastzRun.sh script printf "#!/bin/bash -set -beEu -o pipefail +set -eEu -o pipefail export targetDb=\"${tAccId}\" export queryDb=\"${qAccId}\" export TargetDb=\"${Target}\" export QueryDb=\"${Query}\" cd ${buildDir} time (~/kent/src/hg/utils/automation/doBlastzChainNet.pl ${trackHub} -verbose=2 \`pwd\`/DEF -syntenicNet \\ $tFullName $qFullName -workhorse=${workHorse} -smallClusterHub=${smallClusterHub} \\ -bigClusterHub=${bigHub} \\ -chainMinScore=${minScore} -chainLinearGap=${linearGap}) > do.log 2>&1 grep -w real do.log | sed -e 's/^/ # /;' sed -e 's/^/ # /;' fb.\${targetDb}.chain\${QueryDb}Link.txt @@ -574,31 +574,31 @@ time (~/kent/src/hg/utils/automation/doRecipBest.pl ${rBestTrackHub} -load -workhorse=${workHorse} -buildDir=\`pwd\` \\ ${tRbestArgs} \\ ${qRbestArgs} \\ \${targetDb} \${queryDb}) > rbest.log 2>&1 grep -w real rbest.log | sed -e 's/^/ # /;' sed -e 's/^/ #/;' fb.\${targetDb}.chainRBest.\${QueryDb}.txt " > ${buildDir}/lastzRun.sh chmod +x ${buildDir}/lastzRun.sh ### setup the buildDir/kegAlign.sh script printf "#!/bin/bash # exit on any failure -set -beEu -o pipefail +set -eEu -o pipefail export buildDir=\"${buildDir}\" export swapDir=\"${swapDir}\" export PM=\"${planemoCmd}\" export targetDb=\"${tAccId}\" export queryDb=\"${qAccId}\" export QueryDb=\"${Query}\" export Target=\"${Target}\" export tSizes=\"${targetSizes}\" export qSizes=\"${querySizes}\" ############################################################################ # chainBigBedFb - convert chain to bigBed and compute featureBits # args: db chainName chainGz sizesFile fbFile @@ -641,16 +641,18 @@ printf \"invocation ID: %%s\\n\" \"\${invocationId}\" 1>&2 # record the invocation ID and associated log file for monitoring cron printf \"%%s\\t%%s\\t%%s\\n\" \"\${DS}\" \"\${invocationId}\" \"\${logDir}/runOutput.\${DS}.json\" > pendingInvocationId.txt fi printf \"### workflow submitted, invocation ID in: %%s/pendingInvocationId.txt\\n\" \"\${buildDir}\" 1>&2 " > ${buildDir}/kegAlign.sh chmod +x ${buildDir}/kegAlign.sh ### run the primary alignment, galaxy kegAlign style printf "running: time (${buildDir}/kegAlign.sh) >> ${buildDir}/kegAlign.log 2>&1\n" 1>&2 time (${buildDir}/kegAlign.sh) >> ${buildDir}/keg.log 2>&1 +fi # if [ $primaryDone -eq 0 ]; then + exit $?