Update of /cvsroot/pure-data/scripts/auto-build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5373
Modified Files: pd-extended-auto-builder.sh run-automated-builder Log Message: switched from if to case statement so I can use a wildcard at the end of the test for mingw, since the uname varies depending on the Windows version
Index: pd-extended-auto-builder.sh =================================================================== RCS file: /cvsroot/pure-data/scripts/auto-build/pd-extended-auto-builder.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** pd-extended-auto-builder.sh 21 Oct 2006 04:56:59 -0000 1.13 --- pd-extended-auto-builder.sh 24 Oct 2006 04:21:35 -0000 1.14 *************** *** 61,73 **** echo "Uploading $archive" upload_filename=`ls -1 ${archive} | sed "s|.*/(.*).${archive_format}|\1-${HOSTNAME}.${archive_format}|"` ! if [ "x$SYSTEM" == "xmingw" ]; then ! test -e ${archive} && /c/cygwin/bin/sh --login -c "rsync -a ${archive} \ ! rsync://128.238.56.50/upload/${DATE}/${upload_filename}" && \ ! echo SUCCESS ! else ! test -e ${archive} && rsync -a ${archive} \ ! rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \ ! echo SUCCESS ! fi }
--- 61,76 ---- echo "Uploading $archive" upload_filename=`ls -1 ${archive} | sed "s|.*/(.*).${archive_format}|\1-${HOSTNAME}.${archive_format}|"` ! case $SYSTEM in ! mingw*) ! test -e ${archive} && /c/cygwin/bin/sh --login -c \ ! "rsync -a ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" &&\ ! echo SUCCESS ! ;; ! *) ! test -e ${archive} && rsync -a ${archive} \ ! rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \ ! echo SUCCESS ! ;; ! esac }
Index: run-automated-builder =================================================================== RCS file: /cvsroot/pure-data/scripts/auto-build/run-automated-builder,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** run-automated-builder 21 Oct 2006 04:09:40 -0000 1.13 --- run-automated-builder 24 Oct 2006 04:21:35 -0000 1.14 *************** *** 17,25 **** sh /home/pd/auto-build/${distro}/scripts/auto-build/${distro}-auto-builder.sh >> $LOGFILE 2>&1
! if [ "x$SYSTEM" == "xmingw" ]; then ! /c/cygwin/bin/sh --login -c "rsync -a ${LOGFILE} rsync://128.238.56.50/upload/${DATE}/logs/" ! else ! rsync -a ${LOGFILE} rsync://128.238.56.50/upload/${DATE}/logs/ ! fi
# send status report if something failed --- 17,29 ---- sh /home/pd/auto-build/${distro}/scripts/auto-build/${distro}-auto-builder.sh >> $LOGFILE 2>&1
! case $SYSTEM in ! mingw*) ! /c/cygwin/bin/sh --login -c \ ! "rsync -a ${LOGFILE} rsync://128.238.56.50/upload/${DATE}/logs/" ! ;; ! *) ! rsync -a ${LOGFILE} rsync://128.238.56.50/upload/${DATE}/logs/ ! ;; ! esac
# send status report if something failed