added some improvements ;-) that allow me adapt the script to my setup

without (hopefully) breaking anything;

svn path=/trunk/; revision=5001

1 files changed, 40 insertions, 9 deletions

diff --git a/scripts/load_every_object.sh b/scripts/load_every_object.sh
index 0ba9b03a..eadc0552 100755
--- a/scripts/load_every_object.sh
+++ b/scripts/load_every_object.sh
@@ -10,10 +10,35 @@ LOG_FILE=/tmp/load_every_object-log-`date +20%y-%m-%d_%H.%M.%S`.txt
 TEST_DIR=/tmp
 TEST_PATCH=.____test_patch.pd
 
+PRE_SLEEP=30
+
 helpdir=${PD_ROOT}/doc
 objectsdir=${PD_ROOT}/extra
 bindir=${PD_ROOT}/bin
 
+#PDSEND=${bindir}/pdsend
+#PD=${bindir}/pd
+
+# if ${PD} is not set, it will be set to ${bindir}/pd
+# if ${PD} is already set, this value will be used
+## this way we can use a 'default' pd to test externals
+## that live not necessarily in ${PD_ROOT}/bin/../extra
+if test "x${PD}" = "x" ; then
+ PD=${bindir}/pd
+fi
+if test "x${PDSEND}" = "x" ; then
+ PDSEND=${PDSEND:-${bindir}/pdsend}
+fi
+
+# just imagine there is no [...]/extra directory
+# because i want to test a bunch of "not installed"
+# objects...
+if test -d "${objectsdir}" ; then
+ :
+else
+ objectsdir=${PD_ROOT}
+fi
+
 
 function make_netreceive_patch () 
 {
@@ -35,36 +60,42 @@ function make_patch ()
 function open_patch ()
 {
 	 echo "OPENING: $1 $2" >> $LOG_FILE
-	 echo "; pd open $1 $2;" | ${bindir}/pdsend $PORT_NUMBER localhost tcp
+	 echo "; pd open $1 $2;" | ${PDSEND} $PORT_NUMBER localhost tcp
 }
 
 function close_patch ()
 {
 	 echo "CLOSING: $1" >> $LOG_FILE
-	 echo "; pd-$1 menuclose;" | ${bindir}/pdsend $PORT_NUMBER localhost tcp
+	 echo "; pd-$1 menuclose;" | ${PDSEND} $PORT_NUMBER localhost tcp
 }
 
 UNAME=`uname -s`
-if [ $UNAME == "Darwin" ]; then
+if test "x$UNAME" == "xDarwin" ; then
 	 EXTENSION=pd_darwin
-elif [ $UNAME == "Linux" ]; then
+elif test "x$UNAME" == "xLinux" ; then
 	 EXTENSION=pd_linux
 else
 	 EXTENSION=dll
 fi
 
-echo "Searching for $EXTENSION"
+echo "Searching for ${EXTENSION} in ${objectsdir}"
 
 make_netreceive_patch $NETRECEIVE_PATCH
 
 touch $LOG_FILE
-${bindir}/pd -nogui -stderr -open $NETRECEIVE_PATCH >> $LOG_FILE 2>&1 &
+${PD} -nogui -stderr -open $NETRECEIVE_PATCH -path ${objectsdir} >> $LOG_FILE 2>&1 &
 
 #wait for pd to start
-sleep 30
+echo -n going to sleep for ${PRE_SLEEP} secs...
+sleep ${PRE_SLEEP}
+echo "ready to perform!"
 
-for file in `find $objectsdir -name "*.${EXTENSION}"`; do
+#for file in `find $objectsdir -name "*.${EXTENSION}"`; do
+find ${objectsdir} -name "*.${EXTENSION}" | while read file; do
 	 echo $file
+	 #JMZ: wow, couldn't this be done with following?
+	 # filename=${file##*/}
+	 # dir=${file%/*}
 	 filename=`echo $file|sed 's|.*/\(.*\.[adilnpruwx_]*\)$|\1|'`
 	 dir=`echo $file|sed 's|\(.*\)/.*\.[adilnpruwx_]*$|\1|'`
 	 make_patch $filename ${TEST_DIR}/${TEST_PATCH}
@@ -75,4 +106,4 @@ done
 
 
 echo "COMPLETED!" >> $LOG_FILE
-echo "; pd quit;" | ${bindir}/pdsend $PORT_NUMBER localhost tcp
+echo "; pd quit;" | ${PDSEND} $PORT_NUMBER localhost tcp