From 290efe9d388cf0add947ccc95e478d1131acdbe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 26 Aug 2015 04:56:14 -0300 Subject: rename DERIVATI{ON,VE} -> DD (Derivation Distribution) --- extra/coadde/any-to-ours | 2 +- extra/coadde/xbslibre | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'extra/coadde') diff --git a/extra/coadde/any-to-ours b/extra/coadde/any-to-ours index 7ca2878..179a513 100755 --- a/extra/coadde/any-to-ours +++ b/extra/coadde/any-to-ours @@ -17,7 +17,7 @@ trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR -for 'platform' in "${DERIVATIVE_PLATFORMS[@]}"; do +for 'platform' in "${DD_PLATFORMS[@]}"; do source "$(dirname "$(readlink -e "$0")")/config_${platform}" diff --git a/extra/coadde/xbslibre b/extra/coadde/xbslibre index e40865a..90d36e0 100755 --- a/extra/coadde/xbslibre +++ b/extra/coadde/xbslibre @@ -10,18 +10,18 @@ set -e source "$(dirname "$(readlink -e "$0")")/config_platforms" -for 'platform' in "${DERIVATIVE_PLATFORMS[@]}"; do +for 'platform' in "${DD_PLATFORMS[@]}"; do source "$(dirname "$(readlink -e "$0")")/config_${platform}" function sync_bs_derivation() { for 'ARCH' in 'any' "${ARCHES[@]}"; do - rsync "${SYNC_ARGS}" "${SYNC_DERIVATION_SERVER}::${BS_DERIVATION_NAME}/${ARCH}" "${BS_DERIVATION_DIR}/${ARCH}" || return $? + rsync "${SYNC_ARGS}" "${SYNC_DD_SERVER}::${BS_DD_NAME}/${ARCH}" "${BS_DD_DIR}/${ARCH}" || return $? done # fix some permissions - find "${BS_DERIVATION_DIR}" -type d -print0 | xargs -0 chmod 755 - find "${BS_DERIVATION_DIR}" -type f -print0 | xargs -0 chmod 644 + find "${BS_DD_DIR}" -type d -print0 | xargs -0 chmod 755 + find "${BS_DD_DIR}" -type f -print0 | xargs -0 chmod 644 } function get_blacklist() { @@ -49,11 +49,11 @@ for 'platform' in "${DERIVATIVE_PLATFORMS[@]}"; do git clone "${BS_GIT}" "${BS_GIT_TMP}" fi - # Sync from BS_DERIVATION and then sync from BS + # Sync from BS_DD and then sync from BS printf ":: Syncing ${BS_MAIN_NAME}...\t" (rsync "${SYNC_ARGS}" --delete-excluded \ --exclude-from="${BLACKLIST_TMP}" \ - "${BS_DERIVATION_DIR}" \ + "${BS_DD_DIR}" \ "${BS_MAIN_DIR}" \ && for 'ARCH' in "${ARCHES[@]}"; do rsync -v -mrtq --no-motd --no-p --no-o --no-g --quiet --exclude=.git/ "${BS_GIT_TMP}" "${BS_MAIN_DIR}/${ARCH}/"; done) || { -- cgit v1.2.3-2-g168b