From 290efe9d388cf0add947ccc95e478d1131acdbe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?=
 <coadde@parabola.nu>
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 ++++++------
 src/etc/dbscripts.cfg                        |  4 ++--
 src/etc/dbscripts.d/gnu+hurd_add.cfg         |  6 +++---
 src/etc/dbscripts.d/gnu+linux_add.cfg        |  6 +++---
 src/etc/dbscripts.d/gnu+linux_add_arm.cfg    |  6 +++---
 src/etc/dbscripts.d/gnu+linux_add_legacy.cfg |  6 +++---
 7 files changed, 21 insertions(+), 21 deletions(-)

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) || {
diff --git a/src/etc/dbscripts.cfg b/src/etc/dbscripts.cfg
index 8956683..7970040 100644
--- a/src/etc/dbscripts.cfg
+++ b/src/etc/dbscripts.cfg
@@ -2,5 +2,5 @@
 
 # Platforms Distributions
 MAIN_PLATFORMS=('gnu+linux_native') # 'gnu+hurd_native'
-DERIVATIVE_PLATFORMS=('gnu+linux_add' 'gnu+linux_add_arm') # 'gnu+hurd_add'
-PLATFORMS=("${MAIN_PLATFORMS[@]}" "${DERIVATIVE_PLATFORMS[@]}")
+DD_PLATFORMS=('gnu+linux_add' 'gnu+linux_add_arm') # 'gnu+hurd_add'
+PLATFORMS=("${MAIN_PLATFORMS[@]}" "${DD_PLATFORMS[@]}")
diff --git a/src/etc/dbscripts.d/gnu+hurd_add.cfg b/src/etc/dbscripts.d/gnu+hurd_add.cfg
index 8a18012..d995660 100644
--- a/src/etc/dbscripts.d/gnu+hurd_add.cfg
+++ b/src/etc/dbscripts.d/gnu+hurd_add.cfg
@@ -43,15 +43,15 @@ SRC_POOL="${SRC_POOL_DIR}/abslibre_${PLATFORM}"
 # Build System and Repository scripts
 BS_MAIN_NAME="abslibre_${PLATFORM}"
 BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_DERIVATION_NAME="abs_${PLATFORM}"
-BS_DERIVATION_DIR="${SRV_DIR}/${BS_DERIVATION_NAME}"
+BS_DD_NAME="abs_${PLATFORM}"
+BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}"
 BS_GIT="${GIT_BASE}/abslibre/${BS_MAIN_NAME}.git"
 # BS_GIT='http://projects.parabola.gnu/abslibre/${BS_MAIN_NAME}.git'
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
 BLACKLIST_NAME="blacklist_${PLATFORM}.txt"
 BLACKLIST_FILE="${HOME}/blacklist/${BLACKLIST_NAME}.txt"
 BLACKLIST_TMP="${TMP_DIR}/${BLACKLIST_NAME}.txt"
-SYNC_DERIVATION_SERVER='rsync.archhurd.org'
+SYNC_DD_SERVER='rsync.archhurd.org'
 
 # Base Repository
 REPO_DIR="${SRV_DIR}/repo/abslibre_${PLATFORM}"
diff --git a/src/etc/dbscripts.d/gnu+linux_add.cfg b/src/etc/dbscripts.d/gnu+linux_add.cfg
index 89b7cbc..7ce5ce3 100644
--- a/src/etc/dbscripts.d/gnu+linux_add.cfg
+++ b/src/etc/dbscripts.d/gnu+linux_add.cfg
@@ -43,15 +43,15 @@ SRC_POOL="${SRC_POOL_DIR}/abslibre_${PLATFORM}"
 # Build System and Repository scripts
 BS_MAIN_NAME="abslibre_${PLATFORM}"
 BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_DERIVATION_NAME="abs_${PLATFORM}"
-BS_DERIVATION_DIR="${SRV_DIR}/${BS_DERIVATION_NAME}"
+BS_DD_NAME="abs_${PLATFORM}"
+BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}"
 BS_GIT="${GIT_BASE}/abslibre/${BS_MAIN_NAME}.git"
 # BS_GIT='http://projects.parabola.gnu/abslibre/${BS_MAIN_NAME}.git'
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
 BLACKLIST_NAME="blacklist_${PLATFORM}.txt"
 BLACKLIST_FILE="${HOME}/blacklist/${BLACKLIST_NAME}.txt"
 BLACKLIST_TMP="${TMP_DIR}/${BLACKLIST_NAME}.txt"
-SYNC_DERIVATION_SERVER='rsync.archlinux.org'
+SYNC_DD_SERVER='rsync.archlinux.org'
 
 # Base Repository
 REPO_DIR="${SRV_DIR}/repo/abslibre_${PLATFORM}"
diff --git a/src/etc/dbscripts.d/gnu+linux_add_arm.cfg b/src/etc/dbscripts.d/gnu+linux_add_arm.cfg
index 5f37a46..5679efa 100644
--- a/src/etc/dbscripts.d/gnu+linux_add_arm.cfg
+++ b/src/etc/dbscripts.d/gnu+linux_add_arm.cfg
@@ -43,15 +43,15 @@ SRC_POOL="${SRC_POOL_DIR}/abslibre_${PLATFORM}_arm"
 # Build System and Repository scripts
 BS_MAIN_NAME="abslibre_${PLATFORM}_arm"
 BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_DERIVATION_NAME="abs_${PLATFORM}_arm"
-BS_DERIVATION_DIR="${SRV_DIR}/${BS_DERIVATION_NAME}"
+BS_DD_NAME="abs_${PLATFORM}_arm"
+BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}"
 BS_GIT="${GIT_BASE}/abslibre/${BS_MAIN_NAME}.git"
 # BS_GIT='http://projects.parabola.gnu/abslibre/${BS_MAIN_NAME}.git'
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
 BLACKLIST_NAME="blacklist_${PLATFORM}_arm.txt"
 BLACKLIST_FILE="${HOME}/blacklist/${BLACKLIST_NAME}.txt"
 BLACKLIST_TMP="${TMP_DIR}/${BLACKLIST_NAME}.txt"
-SYNC_DERIVATION_SERVER='rsync.archlinuxarm.org'
+SYNC_DD_SERVER='rsync.archlinuxarm.org'
 
 # Base Repository
 REPO_DIR="${SRV_DIR}/repo/abslibre_${PLATFORM}_arm"
diff --git a/src/etc/dbscripts.d/gnu+linux_add_legacy.cfg b/src/etc/dbscripts.d/gnu+linux_add_legacy.cfg
index 52c6b63..6f6d93e 100644
--- a/src/etc/dbscripts.d/gnu+linux_add_legacy.cfg
+++ b/src/etc/dbscripts.d/gnu+linux_add_legacy.cfg
@@ -43,15 +43,15 @@ SRC_POOL="sources/parabola"
 # Build System and Repository scripts
 BS_MAIN_NAME="abslibre"
 BS_MAIN_DIR="${SRV_DIR}/${BS_MAIN_NAME}"
-BS_DERIVATION_NAME="abs"
-BS_DERIVATION_DIR="${SRV_DIR}/${BS_DERIVATION_NAME}"
+BS_DD_NAME="abs"
+BS_DD_DIR="${SRV_DIR}/${BS_DD_NAME}"
 BS_GIT="${GIT_BASE}/abslibre/${BS_MAIN_NAME}.git"
 # BS_GIT='http://projects.parabola.gnu/abslibre/${BS_MAIN_NAME}.git'
 BS_GIT_TMP="${TMP_DIR}/${BS_MAIN_NAME}"
 BLACKLIST_NAME="blacklist.txt"
 BLACKLIST_FILE="${HOME}/blacklist/${BLACKLIST_NAME}.txt"
 BLACKLIST_TMP="${TMP_DIR}/${BLACKLIST_NAME}.txt"
-SYNC_DERIVATION_SERVER='rsync.archlinux.org'
+SYNC_DD_SERVER='rsync.archlinux.org'
 
 # Base Repository
 REPO_DIR="${SRV_DIR}/repo/main"
-- 
cgit v1.2.3