diff options
| author | Luke Shumaker <lukeshu@parabola.nu> | 2018-06-11 22:17:32 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@parabola.nu> | 2018-06-11 22:43:08 -0400 |
| commit | de978d6dc56fe4dea2980c6a4afd0c8a4c695f48 (patch) | |
| tree | 3bb4aeaa7c59929f43c244b1e51ebe39a9a9a7dd /db-import-pkg | |
| parent | bcd47e4835ec47c700f5aee499de6292345766f0 (diff) | |
db-import-*.conf: Rename ARCHMIRRORPATH->ARCHPATH
Rename ARCHMIRRORPATH to ARCHPATH; the MIRROR bit is redundant and
misleading; it is a property of the upstream itself, not the particular
mirror; and redundant because all upstream-side variables are the ARCH*
variables, no need to clarify that it's remote.
Diffstat (limited to 'db-import-pkg')
| -rwxr-xr-x | db-import-pkg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/db-import-pkg b/db-import-pkg index e8e94c1..a71fda4 100755 --- a/db-import-pkg +++ b/db-import-pkg @@ -34,7 +34,7 @@ fetch_dbs() { # Prints repo directory path for the given <repo> <arch> combination, # relative to the rsync root. get_repo_dir() { - repo=$1 arch=$2 envsubst '$repo $arch' <<<"$ARCHMIRRORPATH" + repo=$1 arch=$2 envsubst '$repo $arch' <<<"$ARCHPATH" } # usage: db_list_pkgs <path-to-db> @@ -256,8 +256,8 @@ main() { local vars case "$UPSTREAM" in - packages|community) vars=(ARCHMIRROR ARCHMIRRORPATH ARCHTAGS ARCHPKGPOOL ARCHSRCPOOL) ;; - archlinux32|archlinuxarm) vars=(ARCHMIRROR ARCHMIRRORPATH ARCHTAGS ARCHPKGPOOL ) ;; + packages|community) vars=(ARCHMIRROR ARCHPATH ARCHTAGS ARCHPKGPOOL ARCHSRCPOOL) ;; + archlinux32|archlinuxarm) vars=(ARCHMIRROR ARCHPATH ARCHTAGS ARCHPKGPOOL ) ;; esac load_conf "$(dirname "$(readlink -e "$0")")/config" DBEXT FILESEXT FTP_BASE load_conf "$(dirname "$(readlink -e "$0")")/db-import-${UPSTREAM}.conf" "${vars[@]}" |