diff options
| -rwxr-xr-x | bin/common-functions | 8 | ||||
| -rwxr-xr-x | bin/db-update | 10 | ||||
| -rwxr-xr-x | bin/return-assignment | 10 | ||||
| -rwxr-xr-x | bin/sanity-check | 6 | ||||
| -rwxr-xr-x | conf/default.conf | 4 |
5 files changed, 19 insertions, 19 deletions
diff --git a/bin/common-functions b/bin/common-functions index 0d46382..9c148a5 100755 --- a/bin/common-functions +++ b/bin/common-functions @@ -255,8 +255,8 @@ ls_master_mirror() { local path="$1" - ${master_mirror_command} \ - "${master_mirror_directory}/${path}/" | \ + ${master_mirror_rsync_command} \ + "${master_mirror_rsync_directory}/${path}/" | \ grep -v '\s\.$' | \ awk '{print $5}' @@ -272,7 +272,7 @@ remove_old_package_versions() { local pkgname="${package%-*-*-*.pkg.tar.xz}" - ${master_mirror_command} \ + ${master_mirror_rsync_command} \ --recursive \ --delete \ $( \ @@ -283,7 +283,7 @@ remove_old_package_versions() { ) \ '--exclude=*' \ ./ \ - "${master_mirror_directory}/${directory}/" + "${master_mirror_rsync_directory}/${directory}/" } diff --git a/bin/db-update b/bin/db-update index 0ee9020..4e8566e 100755 --- a/bin/db-update +++ b/bin/db-update @@ -176,9 +176,9 @@ move_packages() { while read -r repo; do - ${master_mirror_command} \ - "${master_mirror_directory}/i686/${repo}/${repo}.db."* \ - "${master_mirror_directory}/i686/${repo}/${repo}.files."* \ + ${master_mirror_rsync_command} \ + "${master_mirror_rsync_directory}/i686/${repo}/${repo}.db."* \ + "${master_mirror_rsync_directory}/i686/${repo}/${repo}.files."* \ "${tmp_dir}/${repo}/" # add and remove the packages locally @@ -240,10 +240,10 @@ move_packages() { while read -r repo; do - ${dummynator} ${master_mirror_command} \ + ${dummynator} ${master_mirror_rsync_command} \ "${tmp_dir}/${repo}/${repo}.db."* \ "${tmp_dir}/${repo}/${repo}.files."* \ - "${master_mirror_directory}/i686/${repo}/" + "${master_mirror_rsync_directory}/i686/${repo}/" done < \ "${tmp_dir}/repos" diff --git a/bin/return-assignment b/bin/return-assignment index 3175c67..345abf2 100755 --- a/bin/return-assignment +++ b/bin/return-assignment @@ -181,19 +181,19 @@ fi # move packages destination="$(official_or_community "$1.$2.$3.$4")staging" -${master_mirror_command} \ - "${master_mirror_directory}/i686/${destination}/${destination}.db."* \ - "${master_mirror_directory}/i686/${destination}/${destination}.files."* \ +${master_mirror_rsync_command} \ + "${master_mirror_rsync_directory}/i686/${destination}/${destination}.db."* \ + "${master_mirror_rsync_directory}/i686/${destination}/${destination}.files."* \ . repo-add "${destination}.db.tar.gz" ${packages} # repo-add -v -s -k "${repo_key}" "${destination}.db.tar.gz" ${packages} -${master_mirror_command} \ +${master_mirror_rsync_command} \ "${destination}.db."* \ "${destination}.files."* \ ./*".pkg.tar.xz" \ ./*".pkg.tar.xz.sig" \ - "${master_mirror_directory}/i686/${destination}/" + "${master_mirror_rsync_directory}/i686/${destination}/" for package in ${packages}; do remove_old_package_versions "i686/${destination}" "${package}" diff --git a/bin/sanity-check b/bin/sanity-check index 8913f9f..dff043c 100755 --- a/bin/sanity-check +++ b/bin/sanity-check @@ -161,9 +161,9 @@ while [ $# -gt 0 ]; do exit 1 fi - ${master_mirror_command} \ - "${master_mirror_directory}/i686/${repo}/${repo}.db.tar.gz" \ - "${master_mirror_directory}/i686/${repo}/${repo}.files.tar.gz" \ + ${master_mirror_rsync_command} \ + "${master_mirror_rsync_directory}/i686/${repo}/${repo}.db.tar.gz" \ + "${master_mirror_rsync_directory}/i686/${repo}/${repo}.files.tar.gz" \ "${tmp_dir}/" errors="$( diff --git a/conf/default.conf b/conf/default.conf index 7554e33..100ee33 100755 --- a/conf/default.conf +++ b/conf/default.conf @@ -32,8 +32,8 @@ repo_key='0xdeadbeef' package_key='0x15eebadc0de' # to access the master mirror via rsync -master_mirror_command='rsync --password-file=/home/slave/rsync.password' -master_mirror_directory='rsync://buildmaster@mirror.archlinux32.org/packages32' +master_mirror_rsync_command='rsync --password-file=/home/slave/rsync.password' +master_mirror_rsync_directory='rsync://buildmaster@mirror.archlinux32.org/packages32' # to access the master mirror via sshfs (needs to be set up in /etc/fstab) master_mirror_sshfs='/mnt/archlinux32' |