diff options
| author | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-10-21 04:09:40 +0000 |
|---|---|---|
| committer | Hans-Christoph Steiner <eighthave@users.sourceforge.net> | 2006-10-21 04:09:40 +0000 |
| commit | 8418c24f375288de74cb81671c91cdcdbc48242d (patch) | |
| tree | cc789bd430770d0ca9ca2d5d5fa501322d20d4cb /scripts/auto-build | |
| parent | 9fa7a452d4f7116873d57a96619979b05f9ff0ce (diff) | |
made rsync uploads use cygwin shells since Cygwin's rsync doesn't like MinGW's ssh, a requirement for uploading
svn path=/trunk/; revision=6150
Diffstat (limited to 'scripts/auto-build')
| -rwxr-xr-x | scripts/auto-build/pd-extended-auto-builder.sh | 12 | ||||
| -rwxr-xr-x | scripts/auto-build/run-automated-builder | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/scripts/auto-build/pd-extended-auto-builder.sh b/scripts/auto-build/pd-extended-auto-builder.sh index c774453d..b5f7db34 100755 --- a/scripts/auto-build/pd-extended-auto-builder.sh +++ b/scripts/auto-build/pd-extended-auto-builder.sh @@ -58,8 +58,16 @@ upload_build () echo "upload specs $1 $2 $3" echo "Uploading $archive" - test -e ${archive} && rsync -a ${archive} \ - rsync://128.238.56.50/upload/${DATE}/`ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|"` && echo SUCCESS + 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 } diff --git a/scripts/auto-build/run-automated-builder b/scripts/auto-build/run-automated-builder index f07df952..4d9dbe15 100755 --- a/scripts/auto-build/run-automated-builder +++ b/scripts/auto-build/run-automated-builder @@ -16,7 +16,11 @@ run_build_script () 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 completion_test=`tail -1 ${LOGFILE}` |