--- a/scripts/shepard.sh	Fri Mar 05 13:44:17 2010 -0800
+++ b/scripts/shepard.sh	Fri Mar 05 14:23:58 2010 -0800
@@ -4,26 +4,25 @@
 
 SCRIPTS_DIR=/home/symbian/wrttools/scripts
 BASE_DIR=/home/symbian/scratch/build_dir
-DAY_OF_YEAR=`date +%j`
 ECLIPSE_TIMESTAMP=`date +%Y%m%d%H%M%S`-${BUILD_NUMBER:-NO_BUILD_NUMBER}
 HG_CMD=/usr/local/bin/hg
 ANT_CMD=/usr/local/apache-ant-1.8.0/bin/ant
 
 export PATH=.:/usr/java/jdk1.6.0_18/bin:/usr/local/apache-ant-1.8.0/bin/ant:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-export SOURCE_DIR=${BASE_DIR}/${DAY_OF_YEAR}/workspace/wrttools
-export BUILD_DIR=${BASE_DIR}/${DAY_OF_YEAR}/eclipse.build
+WS_DIR=${BASE_DIR}/${BUILD_NUMBER:-NO_BUILD_NUMBER}/workspace
+export SOURCE_DIR=${BASE_DIR}/${BUILD_NUMBER:-NO_BUILD_NUMBER}/workspace/wrttools
+export BUILD_DIR=${BASE_DIR}/${BUILD_NUMBER:-NO_BUILD_NUMBER}/eclipse.build
 
 # display date and time 
 date
 
 # create build structure
 
-mkdir -p ${BASE_DIR}/${DAY_OF_YEAR}/workspace
-mkdir -p ${BASE_DIR}
+mkdir -p ${WS_DIR}
 
 # check out the code.
-cd ${BASE_DIR}/${DAY_OF_YEAR}/workspace
+cd ${WS_DIR}
 ${HG_CMD} clone http://sym-mrswitch:8000 wrttools 
 
 cd ${SOURCE_DIR}/scripts