5291310bbfd5c2f5ffd76a0cb55396504634e2cf
fanhsu
  Tue Feb 8 11:15:31 2011 -0800
Updated checkDecipher.sh to accomodate new DECIPHER release.
diff --git src/utils/decipher/checkDecipher.sh src/utils/decipher/checkDecipher.sh
index 2c099f1..18b6a44 100755
--- src/utils/decipher/checkDecipher.sh
+++ src/utils/decipher/checkDecipher.sh
@@ -33,67 +33,67 @@
 echo "user ftp-decipher-dda ${ftppass}
 cd pub
 ls
 bye" > ftp.decipher.rsp
 
 #	reorganize results files
 rm -f prev.release.list
 rm -f ls.check
 cp -p release.list prev.release.list
 rm -f release.list
 
 #	connect and list a directory, result to file: ls.check
 ftp -n -v -i ftp.sanger.ac.uk  < ftp.decipher.rsp > ls.check
 
 #	fetch the release directory names from the ls.check result file
-grep "decipher_" ls.check | sort > release.list
+grep "decipher-" ls.check | sort > release.list
 chmod o+w release.list
 
 #	verify we are getting a proper list
 WC=`cat release.list | wc -l`
 if [ "${WC}" -lt 1 ]; then
     echo "potential error in DECIPHER release watch,
 check release.list in ${WORKDIR}" \
 	| mail -s "ERROR: DECIPHER watch" ${DEBUG_EMAIL}
     exit 255
 fi
 
 #	see if anything is changing, if so, email notify, download, and build
 
 diff prev.release.list release.list  >release.diff
 WC=`cat release.diff | wc -l`
 if [ "${WC}" -gt 1 ]; then
     echo -e "New DECIPHER update noted at:\n" \
 "ftp://ftp.sanger.ac.uk/pub/\n"`comm -13 prev.release.list release.list`"/" \
     | mail -s "DECIPHER update watch" ${EMAIL}
 
-FN=`cat release.diff |grep decipher_|sed -e 's/decipher_/\tdecipher_/'|cut -f 2`
+FN=`cat release.diff |grep decipher-|sed -e 's/decipher-/\tdecipher-/'|cut -f 2`
 
 today=`date +%F`
 mkdir -p $today
 cd $today
 
 echo "${FN}" >j.fn.gpg
 cat j.fn.gpg |sed -e 's/.gpg//' >j.fn.txt
 
 # prepare ftp download response file
 rm -f ftp.decipher.rsp
 echo "user ftp-decipher-dda ${ftppass}
 cd pub
 get "${FN}"
 bye" > ftp.decipher.rsp
 
 # download the new data file
 ftp -n -v -i ftp.sanger.ac.uk  < ftp.decipher.rsp > ftp.log
 
-rm -f `cat j.fn.txt`
+#rm -f `cat j.fn.txt`
 
 # unpack the gpg encrypted file
 gpg --passphrase "${gpgpass}"  "${FN}"
 
 # build the new DECIPHER track tables
 ../buildDecipher `cat j.fn.txt`
 
 rm j.fn.txt
 rm j.fn.gpg
 fi