From 432de6d7dfcd59fe61cc535c6334bc83e19d0572 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 28 Sep 2012 16:23:18 +0000 Subject: set rsync server via a single variable in auto-build-common svn path=/trunk/; revision=16312 --- scripts/auto-build/auto-build-common | 3 ++- scripts/auto-build/pd-devel-auto-builder.sh | 12 ++++++------ scripts/auto-build/pd-double-auto-builder.sh | 8 ++++---- scripts/auto-build/pd-extended-auto-builder.sh | 8 ++++---- scripts/auto-build/pd-extended-release-auto-builder.sh | 8 ++++---- scripts/auto-build/pd-main+libs-auto-builder.sh | 8 ++++---- scripts/auto-build/pd-main-auto-builder.sh | 6 +++--- scripts/auto-build/pd-puredyne-auto-builder.sh | 6 +++--- scripts/auto-build/run-automated-builder | 4 ++-- 9 files changed, 32 insertions(+), 31 deletions(-) (limited to 'scripts/auto-build') diff --git a/scripts/auto-build/auto-build-common b/scripts/auto-build/auto-build-common index c30ffa0c..fe05b017 100644 --- a/scripts/auto-build/auto-build-common +++ b/scripts/auto-build/auto-build-common @@ -5,6 +5,7 @@ SYSTEM=$(uname -s | sed 'y|ABCDEFGHIJKLMNOPQRSTUVWXYZ|abcdefghijklmnopqrstuvwxyz DATE=$(date +%Y-%m-%d) TIME=$(date +%H.%M.%S) HOSTNAME=$(hostname | sed 's|\([a-zA-Z0-9-]\)\..*|\1|' | sed 'y|ABCDEFGHIJKLMNOPQRSTUVWXYZ|abcdefghijklmnopqrstuvwxyz|') +RSYNC_SERVER=blinky.at.or.at # use the hostname from /etc/hostname in case we are a chroot build enviroment if [ -e /etc/hostname ]; then @@ -68,7 +69,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://128.238.56.50/distros/${DISTRO}/ ${1}/" + RSYNC_COMMAND="rsync -a --delete-before rsync://${RSYNC_SERVER}/distros/${DISTRO}/ ${1}/" case $SYSTEM in mingw*) /c/cygwin/bin/sh -c "$RSYNC_COMMAND" diff --git a/scripts/auto-build/pd-devel-auto-builder.sh b/scripts/auto-build/pd-devel-auto-builder.sh index cf8a0909..c3e5fc8b 100755 --- a/scripts/auto-build/pd-devel-auto-builder.sh +++ b/scripts/auto-build/pd-devel-auto-builder.sh @@ -45,10 +45,10 @@ echo "root: $auto_build_root_dir" case $SYSTEM in mingw*) /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links --delete rsync://128.238.56.50/distros/pd-devel/ ${auto_build_root_dir}/" + "rsync --archive --no-links --copy-links --delete rsync://${RSYNC_SERVER}/distros/pd-devel/ ${auto_build_root_dir}/" ;; *) - rsync -a --delete rsync://128.238.56.50/distros/pd-devel/ ${auto_build_root_dir}/ + rsync -a --delete rsync://${RSYNC_SERVER}/distros/pd-devel/ ${auto_build_root_dir}/ ;; esac @@ -77,17 +77,17 @@ upload_build () case $SYSTEM in mingw*) /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links --chmod=a+r ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" && \ + "rsync --archive --no-links --copy-links --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}" && \ md5sum ${archive} > ${archive}.md5 && \ /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links ${archive}.md5 rsync://128.238.56.50/upload/${DATE}/${upload_filename}.md5" && \ + "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://128.238.56.50/upload/${DATE}/${upload_filename} && \ + rsync -a --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ md5sum ${archive} > ${archive}.md5 && \ - rsync -a ${archive}.md5 rsync://128.238.56.50/upload/${DATE}/${upload_filename}.md5 && \ + rsync -a ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5 && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; diff --git a/scripts/auto-build/pd-double-auto-builder.sh b/scripts/auto-build/pd-double-auto-builder.sh index c6e3ae40..e5942403 100755 --- a/scripts/auto-build/pd-double-auto-builder.sh +++ b/scripts/auto-build/pd-double-auto-builder.sh @@ -42,10 +42,10 @@ echo "root: $auto_build_root_dir" case $SYSTEM in mingw*) /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links --delete rsync://128.238.56.50/distros/pd-double/ ${auto_build_root_dir}/" + "rsync --archive --no-links --copy-links --delete rsync://${RSYNC_SERVER}/distros/pd-double/ ${auto_build_root_dir}/" ;; *) - rsync -a --delete rsync://128.238.56.50/distros/pd-double/ ${auto_build_root_dir}/ + rsync -a --delete rsync://${RSYNC_SERVER}/distros/pd-double/ ${auto_build_root_dir}/ ;; esac @@ -72,13 +72,13 @@ upload_build () case $SYSTEM in mingw*) test -e ${archive} && /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" && \ + "rsync --archive --no-links --copy-links ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}" && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; *) test -e ${archive} && rsync -a ${archive} \ - rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \ + rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; diff --git a/scripts/auto-build/pd-extended-auto-builder.sh b/scripts/auto-build/pd-extended-auto-builder.sh index 3d9ab94b..5efc3399 100755 --- a/scripts/auto-build/pd-extended-auto-builder.sh +++ b/scripts/auto-build/pd-extended-auto-builder.sh @@ -100,17 +100,17 @@ upload_build () case $SYSTEM in mingw*) /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links --chmod=a+r ${archive} rsync://blinky.at.or.at/upload/${DATE}/${upload_filename}" && \ + "rsync --archive --no-links --copy-links --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}" && \ md5sum ${archive} > ${archive}.md5 && \ /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links ${archive}.md5 rsync://blinky.at.or.at/upload/${DATE}/${upload_filename}.md5" && \ + "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://blinky.at.or.at/upload/${DATE}/${upload_filename} && \ + rsync -a --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ md5sum ${archive} > ${archive}.md5 && \ - rsync -a ${archive}.md5 rsync://blinky.at.or.at/upload/${DATE}/${upload_filename}.md5 && \ + rsync -a ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5 && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; diff --git a/scripts/auto-build/pd-extended-release-auto-builder.sh b/scripts/auto-build/pd-extended-release-auto-builder.sh index bd5ffde5..9b2d46c4 100755 --- a/scripts/auto-build/pd-extended-release-auto-builder.sh +++ b/scripts/auto-build/pd-extended-release-auto-builder.sh @@ -66,17 +66,17 @@ upload_build () case $SYSTEM in mingw*) /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links --chmod=a+r ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" && \ + "rsync --archive --no-links --copy-links --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}" && \ md5sum ${archive} > ${archive}.md5 && \ /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links ${archive}.md5 rsync://128.238.56.50/upload/${DATE}/${upload_filename}.md5" && \ + "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://128.238.56.50/upload/${DATE}/${upload_filename} && \ + rsync -a --chmod=a+r ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ md5sum ${archive} > ${archive}.md5 && \ - rsync -a ${archive}.md5 rsync://128.238.56.50/upload/${DATE}/${upload_filename}.md5 && \ + rsync -a ${archive}.md5 rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}.md5 && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; diff --git a/scripts/auto-build/pd-main+libs-auto-builder.sh b/scripts/auto-build/pd-main+libs-auto-builder.sh index 7cbdbf02..18552044 100755 --- a/scripts/auto-build/pd-main+libs-auto-builder.sh +++ b/scripts/auto-build/pd-main+libs-auto-builder.sh @@ -42,10 +42,10 @@ echo "root: $auto_build_root_dir" case $SYSTEM in mingw*) /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links --delete rsync://128.238.56.50/distros/pd-main+libs/ ${auto_build_root_dir}/" + "rsync --archive --no-links --copy-links --delete rsync://${RSYNC_SERVER}/distros/pd-main+libs/ ${auto_build_root_dir}/" ;; *) - rsync -a --delete rsync://128.238.56.50/distros/pd-main+libs/ ${auto_build_root_dir}/ + rsync -a --delete rsync://${RSYNC_SERVER}/distros/pd-main+libs/ ${auto_build_root_dir}/ ;; esac @@ -72,13 +72,13 @@ upload_build () case $SYSTEM in mingw*) test -e ${archive} && /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" && \ + "rsync --archive --no-links --copy-links ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}" && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; *) test -e ${archive} && rsync -a ${archive} \ - rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \ + rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; diff --git a/scripts/auto-build/pd-main-auto-builder.sh b/scripts/auto-build/pd-main-auto-builder.sh index c494b029..bdf455af 100755 --- a/scripts/auto-build/pd-main-auto-builder.sh +++ b/scripts/auto-build/pd-main-auto-builder.sh @@ -37,7 +37,7 @@ echo "root: $auto_build_root_dir" # let rsync handle the cleanup with --delete -rsync -av --delete rsync://128.238.56.50/distros/pd-main/ \ +rsync -av --delete rsync://${RSYNC_SERVER}/distros/pd-main/ \ ${auto_build_root_dir}/ case $SYSTEM in @@ -52,7 +52,7 @@ case $SYSTEM in make readme_install && \ make package && \ rsync -a ${archive} \ - rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \ + rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; @@ -64,7 +64,7 @@ case $SYSTEM in make && \ cd ../../ && \ tar cjf $package_name pd && \ - rsync -a ${package_name} rsync://128.238.56.50/upload/${DATE}/ && \ + rsync -a ${package_name} rsync://${RSYNC_SERVER}/upload/${DATE}/ && \ rm -f -- ${package_name} && \ echo "successfully uploaded: ${package_name}" && \ echo SUCCESS diff --git a/scripts/auto-build/pd-puredyne-auto-builder.sh b/scripts/auto-build/pd-puredyne-auto-builder.sh index d06ef7ad..0c7632fb 100755 --- a/scripts/auto-build/pd-puredyne-auto-builder.sh +++ b/scripts/auto-build/pd-puredyne-auto-builder.sh @@ -39,7 +39,7 @@ auto_build_root_dir=$(pwd) echo "root: $auto_build_root_dir" # let rsync handle the cleanup with --delete -rsync -a --delete rsync://128.238.56.50/distros/pd-puredyne/ \ +rsync -a --delete rsync://${RSYNC_SERVER}/distros/pd-puredyne/ \ ${auto_build_root_dir}/ cd "${auto_build_root_dir}/packages/$BUILD_DIR" @@ -64,13 +64,13 @@ upload_build () case $SYSTEM in mingw*) test -e ${archive} && /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links ${archive} rsync://128.238.56.50/upload/${DATE}/${upload_filename}" &&\ + "rsync --archive --no-links --copy-links ${archive} rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename}" &&\ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; *) test -e ${archive} && rsync -a ${archive} \ - rsync://128.238.56.50/upload/${DATE}/${upload_filename} && \ + rsync://${RSYNC_SERVER}/upload/${DATE}/${upload_filename} && \ echo "successfully uploaded: ${upload_filename}" && \ echo SUCCESS ;; diff --git a/scripts/auto-build/run-automated-builder b/scripts/auto-build/run-automated-builder index 911e25ac..4e86ae5e 100755 --- a/scripts/auto-build/run-automated-builder +++ b/scripts/auto-build/run-automated-builder @@ -57,10 +57,10 @@ run_build_script () case $SYSTEM in mingw*) /c/cygwin/bin/sh -c \ - "rsync --archive --no-links --copy-links ${LOGFILE} rsync://128.238.56.50/upload/${DATE}/logs/" + "rsync --archive --no-links --copy-links ${LOGFILE} rsync://${RSYNC_SERVER}/upload/${DATE}/logs/" ;; *) - rsync -a "$LOGFILE" rsync://128.238.56.50/upload/${DATE}/logs/ + rsync -a "$LOGFILE" rsync://${RSYNC_SERVER}/upload/${DATE}/logs/ ;; esac -- cgit v1.2.1