From dcb06b94399279fa6ccc09cfda5451bc267a9b57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?coadde=20=5BM=C3=A1rcio=20Alexandre=20Silva=20Delgado=5D?= Date: Wed, 23 Sep 2015 19:38:42 -0300 Subject: rename more variables --- config | 2 +- config.d/gnu+linux_arm_arch_legacy | 2 +- config.d/gnu+linux_x86_arch_legacy | 2 +- cron-jobs/ftpdir-cleanup | 14 +++++++------- cron-jobs/sourceballs | 34 +++++++++++++++++----------------- db-check-nonfree | 2 +- db-functions | 10 +++++----- db-sync | 20 ++++++++++---------- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/config b/config index 1e3896d..12f182e 100644 --- a/config +++ b/config @@ -32,4 +32,4 @@ files_extension_suffixfile=".files.tar.gz" package_extension_suffixfile=".pkg.tar.?z" source_extension_suffixfile=".src.tar.gz" -BLACKLIST_FILE="$HOME/blacklist/blacklist.txt" +blacklist_file="$HOME/blacklist/blacklist.txt" diff --git a/config.d/gnu+linux_arm_arch_legacy b/config.d/gnu+linux_arm_arch_legacy index 2dcda29..49b599e 100644 --- a/config.d/gnu+linux_arm_arch_legacy +++ b/config.d/gnu+linux_arm_arch_legacy @@ -38,4 +38,4 @@ mirror="mirrors.niyawe.de" #mirror="mirror.bytemark.co.uk" #mirror="mirror.de.leaseweb.net" -mirrorpath="archlinux" +mirror_path="archlinux" diff --git a/config.d/gnu+linux_x86_arch_legacy b/config.d/gnu+linux_x86_arch_legacy index 13d851f..00c5fee 100644 --- a/config.d/gnu+linux_x86_arch_legacy +++ b/config.d/gnu+linux_x86_arch_legacy @@ -38,4 +38,4 @@ mirror="mirrors.niyawe.de" #mirror="mirror.bytemark.co.uk" #mirror="mirror.de.leaseweb.net" -mirrorpath="archlinux" +mirror_path="archlinux" diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup index 452aa83..2b32eae 100755 --- a/cron-jobs/ftpdir-cleanup +++ b/cron-jobs/ftpdir-cleanup @@ -30,11 +30,11 @@ for repo in "${PKGREPOS[@]}"; do continue fi # get a list of actual available package files - find "${root_dir}/${repo}/os/${arch}" -xtype f -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${WORKDIR}/repo-${repo}-${arch}" + find "${root_dir}/${repo}/os/${arch}" -xtype f -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${work_directory}/repo-${repo}-${arch}" # get a list of package files defined in the repo db - bsdtar -xOf "${root_dir}/${repo}/os/${arch}/${repo}${database_extension_suffixfile}" | awk '/^%FILENAME%/{getline;print}' | sort > "${WORKDIR}/db-${repo}-${arch}" + bsdtar -xOf "${root_dir}/${repo}/os/${arch}/${repo}${database_extension_suffixfile}" | awk '/^%FILENAME%/{getline;print}' | sort > "${work_directory}/db-${repo}-${arch}" - missing_pkgs=($(comm -13 "${WORKDIR}/repo-${repo}-${arch}" "${WORKDIR}/db-${repo}-${arch}")) + missing_pkgs=($(comm -13 "${work_directory}/repo-${repo}-${arch}" "${work_directory}/db-${repo}-${arch}")) if [ ${#missing_pkgs[@]} -ge 1 ]; then error "Missing packages in [%s] (%s)..." "${repo}" "${arch}" for missing_pkg in "${missing_pkgs[@]}"; do @@ -42,7 +42,7 @@ for repo in "${PKGREPOS[@]}"; do done fi - old_pkgs=($(comm -23 "${WORKDIR}/repo-${repo}-${arch}" "${WORKDIR}/db-${repo}-${arch}")) + old_pkgs=($(comm -23 "${work_directory}/repo-${repo}-${arch}" "${work_directory}/db-${repo}-${arch}")) if [ ${#old_pkgs[@]} -ge 1 ]; then msg "Removing old packages from [%s] (%s)..." "${repo}" "${arch}" for old_pkg in "${old_pkgs[@]}"; do @@ -54,11 +54,11 @@ for repo in "${PKGREPOS[@]}"; do done # get a list of all available packages in the pacakge pool -find "${root_dir}/${PKGPOOL}" -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${WORKDIR}/pool" +find "${root_dir}/${PKGPOOL}" -name "*${package_extension_suffixfile}" -printf '%f\n' | sort > "${work_directory}/pool" # create a list of packages in our db -cat "${WORKDIR}/db-"* | sort -u > "${WORKDIR}/db" +cat "${work_directory}/db-"* | sort -u > "${work_directory}/db" -old_pkgs=($(comm -23 "${WORKDIR}/pool" "${WORKDIR}/db")) +old_pkgs=($(comm -23 "${work_directory}/pool" "${work_directory}/db")) if [ ${#old_pkgs[@]} -ge 1 ]; then msg "Removing old packages from package pool..." for old_pkg in "${old_pkgs[@]}"; do diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index 7df349c..53ffff9 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -3,7 +3,7 @@ dirname="$(dirname "$(readlink -e "$0")")" . "${dirname}/../config" . "${dirname}/../db-functions" -pushd "${WORKDIR}" >/dev/null +pushd "${work_directory}" >/dev/null script_lock @@ -36,7 +36,7 @@ for repo in "${PKGREPOS[@]}"; do printf "%s %s %s %s\n", b, v, a, l; l=""; }' - done | sort -u > "${WORKDIR}/db-${repo}" + done | sort -u > "${work_directory}/db-${repo}" done for repo in "${PKGREPOS[@]}"; do @@ -46,7 +46,7 @@ for repo in "${PKGREPOS[@]}"; do done # Create a list of all available source package file names -find "${root_dir}/${SRCPOOL}" -xtype f -name "*${source_extension_suffixfile}" -printf '%f\n' | sort -u > "${WORKDIR}/available-src-pkgs" +find "${root_dir}/${SRCPOOL}" -xtype f -name "*${source_extension_suffixfile}" -printf '%f\n' | sort -u > "${work_directory}/available-src-pkgs" # Check for all packages if we need to build a source package for repo in "${PKGREPOS[@]}"; do @@ -69,39 +69,39 @@ for repo in "${PKGREPOS[@]}"; do # continue # fi # Store the expected file name of the source package - echo "${pkgbase}-${pkgver}${source_extension_suffixfile}" >> "${WORKDIR}/expected-src-pkgs" + echo "${pkgbase}-${pkgver}${source_extension_suffixfile}" >> "${work_directory}/expected-src-pkgs" # Build the source package if its not already there - if ! grep -Fqx "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${WORKDIR}/available-src-pkgs"; then + if ! grep -Fqx "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${work_directory}/available-src-pkgs"; then # Check if we had failed before if in_array "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${failedpkgs[@]}"; then continue fi # Get the sources from xbs - mkdir -p -m0770 "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}" + mkdir -p -m0770 "${work_directory}/pkgbuilds/${repo}-${pkgarch}" cp -a "$(xbs releasepath "${pkgbase}" "${repo}" "${pkgarch}")" \ - "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1 + "${work_directory}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null 2>&1 if [ $? -ge 1 ]; then failedpkgs+=("${pkgbase}-${pkgver}${source_extension_suffixfile}") continue fi # Build the actual source package - pushd "${WORKDIR}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null - SRCPKGDEST=. makepkg --nocolor --allsource --ignorearch --skippgpcheck >"${WORKDIR}/${pkgbase}.log" 2>&1 + pushd "${work_directory}/pkgbuilds/${repo}-${pkgarch}/${pkgbase}" >/dev/null + SRCPKGDEST=. makepkg --nocolor --allsource --ignorearch --skippgpcheck >"${work_directory}/${pkgbase}.log" 2>&1 if [ $? -eq 0 ] && [ -f "${pkgbase}-${pkgver}${source_extension_suffixfile}" ]; then mv_acl "${pkgbase}-${pkgver}${source_extension_suffixfile}" "${root_dir}/${SRCPOOL}/${pkgbase}-${pkgver}${source_extension_suffixfile}" # Avoid creating the same source package for every arch - echo "${pkgbase}-${pkgver}${source_extension_suffixfile}" >> "${WORKDIR}/available-src-pkgs" + echo "${pkgbase}-${pkgver}${source_extension_suffixfile}" >> "${work_directory}/available-src-pkgs" newpkgs+=("${pkgbase}-${pkgver}${source_extension_suffixfile}") else failedpkgs+=("${pkgbase}-${pkgver}${source_extension_suffixfile}") - cat "${WORKDIR}/${pkgbase}.log" >> "${WORKDIR}/makepkg-fail.log" + cat "${work_directory}/${pkgbase}.log" >> "${work_directory}/makepkg-fail.log" fi popd >/dev/null fi - done < "${WORKDIR}/db-${repo}" + done < "${work_directory}/db-${repo}" if [ ${#newpkgs[@]} -ge 1 ]; then msg "Adding source packages for [%s]..." "${repo}" @@ -118,9 +118,9 @@ for repo in "${PKGREPOS[@]}"; do done # Cleanup old source packages -cat "${WORKDIR}/expected-src-pkgs" | sort -u > "${WORKDIR}/expected-src-pkgs.sort" -cat "${WORKDIR}/available-src-pkgs" | sort -u > "${WORKDIR}/available-src-pkgs.sort" -old_pkgs=($(comm -23 "${WORKDIR}/available-src-pkgs.sort" "${WORKDIR}/expected-src-pkgs.sort")) +cat "${work_directory}/expected-src-pkgs" | sort -u > "${work_directory}/expected-src-pkgs.sort" +cat "${work_directory}/available-src-pkgs" | sort -u > "${work_directory}/available-src-pkgs.sort" +old_pkgs=($(comm -23 "${work_directory}/available-src-pkgs.sort" "${work_directory}/expected-src-pkgs.sort")) if [ ${#old_pkgs[@]} -ge 1 ]; then msg "Removing old source packages..." @@ -143,9 +143,9 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then done fi -if [ -f "${WORKDIR}/makepkg-fail.log" ]; then +if [ -f "${work_directory}/makepkg-fail.log" ]; then msg "Log of failed packages" - cat "${WORKDIR}/makepkg-fail.log" + cat "${work_directory}/makepkg-fail.log" fi script_unlock diff --git a/db-check-nonfree b/db-check-nonfree index 666f4d6..6fcc8ab 100755 --- a/db-check-nonfree +++ b/db-check-nonfree @@ -16,7 +16,7 @@ for repo in "${repos[@]}"; do done msg "Check nonfree in repo:" -nonfree=($(cut -d: -f1 "${BLACKLIST_FILE}" | sort -u)) +nonfree=($(cut -d: -f1 "${blacklist_file}" | sort -u)) for repo in "${ARCHREPOS[@]}"; do for pkgarch in "${ARCHES[@]}"; do msg2 "%s %s" "$repo" "$pkgarch" diff --git a/db-functions b/db-functions index 52676c7..9afb9e2 100644 --- a/db-functions +++ b/db-functions @@ -25,7 +25,7 @@ mv_acl() { } # set up general environment -WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX") +work_directory=$(mktemp -dt "${0##*/}.XXXXXXXXXX") LOCKS=() REPO_MODIFIED=0 @@ -137,7 +137,7 @@ cleanup() { msg "Removing left over lock from %s" "${0##*/}" script_unlock fi - rm -rf "$WORKDIR" + rm -rf "${work_directory}" if (( REPO_MODIFIED )); then date +%s > "${root_dir}/lastupdate" @@ -378,8 +378,8 @@ check_splitpkgs() { local pkgdir local xbsname - mkdir -p "${WORKDIR}/check_splitpkgs/" - pushd "${WORKDIR}/check_splitpkgs" >/dev/null + mkdir -p "${work_directory}/check_splitpkgs/" + pushd "${work_directory}/check_splitpkgs" >/dev/null for pkgfile in "${pkgfiles[@]}"; do issplitpkg "${pkgfile}" || continue @@ -395,7 +395,7 @@ check_splitpkgs() { done popd >/dev/null - for pkgdir in "${WORKDIR}/check_splitpkgs/${repo}"/*/*; do + for pkgdir in "${work_directory}/check_splitpkgs/${repo}"/*/*; do [ ! -d "${pkgdir}" ] && continue sort -u "${pkgdir}/staging" -o "${pkgdir}/staging" sort -u "${pkgdir}/xbs" -o "${pkgdir}/xbs" diff --git a/db-sync b/db-sync index 06161a2..dde21e3 100755 --- a/db-sync +++ b/db-sync @@ -19,8 +19,8 @@ VERBOSE=${V} extra=() ${VERBOSE} && extra+=(-v) -WORKDIR=$(mktemp -dt "${0##*/}.XXXXXXXXXX") -trap "rm -rf -- $(printf '%q' "${WORKDIR}")" EXIT +work_directory=$(mktemp -dt "${0##*/}.XXXXXXXXXX") +trap "rm -rf -- $(printf '%q' "${work_directory}")" EXIT # Returns contents of a repo get_repos() { @@ -32,7 +32,7 @@ get_repos() { --include="*${files_extension_suffixfile}" \ --exclude="*" \ --delete-after \ - "rsync://${mirror}/${mirrorpath}/" "$WORKDIR" + "rsync://${mirror}/${mirror_path}/" "${work_directory}" } get_repo_content() { @@ -44,13 +44,13 @@ get_repo_content() { # Prints blacklisted packages get_blacklist() { - cut -d ':' -f 1 "${BLACKLIST_FILE}" + cut -d ':' -f 1 "${blacklist_file}" } # repo # arch get_repo_file() { - echo "${WORKDIR}/${1}/os/${2}/${1}" + echo "${work_directory}/${1}/os/${2}/${1}" } # Process the databases and get the libre packages @@ -116,7 +116,7 @@ init() { --delay-updates \ --include-from="/tmp/${_repo}-${_arch}.whitelist" \ --exclude="*" \ - "rsync://${mirror}/${mirrorpath}/${_repo}/os/${_arch}/" \ + "rsync://${mirror}/${mirror_path}/${_repo}/os/${_arch}/" \ "${root_dir}/${_repo}/os/${_arch}/" # Add a new whitelist @@ -126,7 +126,7 @@ init() { rsync "${extra[@]}" --no-motd -rtlH \ --delay-updates \ --safe-links \ - "${WORKDIR}/${_repo}/os/${_arch}/" \ + "${work_directory}/${_repo}/os/${_arch}/" \ "${root_dir}/${_repo}/os/${_arch}/" # Cleanup @@ -151,7 +151,7 @@ init() { --safe-links \ --include-from=/tmp/any.whitelist \ --exclude="*" \ - "rsync://${mirror}/${mirrorpath}/${pkgpool}/" \ + "rsync://${mirror}/${mirror_path}/${pkgpool}/" \ "${root_dir}/${pkgpool}/" done @@ -170,7 +170,7 @@ init() { --safe-links \ --include-from=/tmp/any.whitelist \ --exclude="*" \ - "rsync://${mirror}/${mirrorpath}/${srcpool}/" \ + "rsync://${mirror}/${mirror_path}/${srcpool}/" \ "${root_dir}/${srcpool}/" done @@ -192,7 +192,7 @@ source "$(dirname "$(readlink -e "$0")")/config" source "$(dirname "$(readlink -e "$0")")/db-libremessages" # Check variables presence -for var in database_extension_suffixfile files_extension_suffixfile mirror mirrorpath WORKDIR BLACKLIST_FILE root_dir ARCHSRCPOOLS ARCHPKGPOOLS; do +for var in database_extension_suffixfile files_extension_suffixfile mirror mirror_path work_directory blacklist_file root_dir ARCHSRCPOOLS ARCHPKGPOOLS; do test -z "${!var}" && fatal_error "Empty %s" "${var}" done -- cgit v1.2.3