diff options
| -rw-r--r-- | scripts/auto-build/auto-build-common | 10 | ||||
| -rwxr-xr-x | scripts/auto-build/pd-extended-auto-builder.sh | 23 |
2 files changed, 6 insertions, 27 deletions
diff --git a/scripts/auto-build/auto-build-common b/scripts/auto-build/auto-build-common index ab4aca3c..40d6a69b 100644 --- a/scripts/auto-build/auto-build-common +++ b/scripts/auto-build/auto-build-common @@ -71,15 +71,7 @@ rsync_distro() # let rsync handle the cleanup with --delete DISTRO=$(basename $1) echo "rsyncing $DISTRO to ${1}:" - RSYNC_COMMAND="rsync -a --delete-before rsync://${RSYNC_SERVER}/distros/${DISTRO}/ ${1}/" - case $SYSTEM in - mingw*) - /c/cygwin/bin/sh -c "$RSYNC_COMMAND" - ;; - *) - $RSYNC_COMMAND - ;; - esac + rsync -a --delete-before rsync://${RSYNC_SERVER}/distros/${DISTRO}/ ${1}/ } # Mac OS X's included git or svn might be really old, so try Fink first diff --git a/scripts/auto-build/pd-extended-auto-builder.sh b/scripts/auto-build/pd-extended-auto-builder.sh index d0e2c572..d9db1cf6 100755 --- a/scripts/auto-build/pd-extended-auto-builder.sh +++ b/scripts/auto-build/pd-extended-auto-builder.sh @@ -101,24 +101,11 @@ upload_build () echo "Uploading $archive" upload_filename=$(ls -1 ${archive} | sed "s|.*/\(.*\)\.${archive_format}|\1-${HOSTNAME}.${archive_format}|") if [ -e ${archive} ]; then - case $SYSTEM in - mingw*) - /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}" && \ - md5sum ${archive} | sed "s|^\([0-9a-f][0-9a-f]* \).*|\1${archive}|" > ${archive}.md5 && \ - /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5" && \ - echo "successfully uploaded: ${upload_filename}" && \ - echo SUCCESS - ;; - *) - rsync -a --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ - md5sum ${archive} | sed "s|^\([0-9a-f][0-9a-f]* \).*|\1${archive}|" > ${archive}.md5 && \ - rsync -a ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5 && \ - echo "successfully uploaded: ${upload_filename}" && \ - echo SUCCESS - ;; - esac + rsync -a --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ + md5sum ${archive} | sed "s|^\([0-9a-f][0-9a-f]* \).*|\1${archive}|" > ${archive}.md5 && \ + rsync -a ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5 && \ + echo "successfully uploaded: ${upload_filename}" && \ + echo SUCCESS fi } |