diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-18 14:06:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-18 14:06:59 -0400 |
| commit | 32786b02317f9018ae6e1b7aa069763e9496a834 (patch) | |
| tree | de25210cbb95470239e20105f7225d0ffd1d7beb /any-to-ours | |
| parent | cc3720b21451fbf73e0075b0955653fb37d1e106 (diff) | |
| parent | 3abd3eaf4b3e6495d4603a8eb478e0f603ad51d9 (diff) | |
Merge branch 'master' into lukeshu/xbs
Conflicts:
any-to-ours
create-repo
cron-jobs/ftpdir-cleanup
cron-jobs/repo-sanity-check
cron-jobs/sourceballs
cron-jobs/sourceballs2
db-check-nonfree
db-cleanup
db-functions
db-move
db-remove
db-sync
db-update
libremessages
testing2x
Diffstat (limited to 'any-to-ours')
| -rwxr-xr-x | any-to-ours | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/any-to-ours b/any-to-ours index 4ba01dc..8a4e874 100755 --- a/any-to-ours +++ b/any-to-ours @@ -21,8 +21,8 @@ trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR BASEARCH='x86_64' # Traverse all Arch repos -for _repo in ${ARCHREPOS[@]}; do - msg "Processing ${_repo}..." +for _repo in "${ARCHREPOS[@]}"; do + msg "Processing %s..." "${_repo}" # Find 'any' packages # This is hardcoded but it could release other arches... @@ -31,12 +31,12 @@ for _repo in ${ARCHREPOS[@]}; do -printf "%f ")) if [ ${#PKGS[@]} -eq 0 ]; then - msg2 "No 'any' packages here" + msg2 "No '%s' packages here" any continue fi - for _arch in ${OURARCHES[@]}; do - msg2 "Syncing ${_arch}..." + for _arch in "${OURARCHES[@]}"; do + msg2 "Syncing %s..." "${_arch}" # Sync 'any' only and extract the synced packages SYNCED=($( @@ -44,8 +44,8 @@ for _repo in ${ARCHREPOS[@]}; do --include='*-any.pkg.tar.?z' \ --include='*-any.pkg.tar.?z.sig' \ --exclude='*' \ - ${FTP_BASE}/${_repo}/os/${BASEARCH}/ \ - ${FTP_BASE}/${_repo}/os/${_arch}/ 2>&1 | \ + "${FTP_BASE}/${_repo}/os/${BASEARCH}/" \ + "${FTP_BASE}/${_repo}/os/${_arch}/" 2>&1 | \ grep 'any\.pkg\.tar\..z$' | \ cut -d ' ' -f 1 )) @@ -54,15 +54,14 @@ for _repo in ${ARCHREPOS[@]}; do continue fi - msg2 "Synced ${#SYNCED[@]} packages: ${SYNCED[@]}" + msg2 "Synced %d packages: %s" "${#SYNCED[@]}" "${SYNCED[*]}" msg2 "Adding to db..." - pushd ${FTP_BASE}/${_repo}/os/${_arch}/ >/dev/null + pushd "${FTP_BASE}/${_repo}/os/${_arch}/" >/dev/null # Add the packages to the db - repo-add ${_repo}${DBEXT} \ - ${SYNCED[@]} + repo-add "${_repo}${DBEXT}" "${SYNCED[@]}" popd >/dev/null |