diff options
Diffstat (limited to 'db-sync')
| -rwxr-xr-x | db-sync | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -68,8 +68,8 @@ init() { get_repos # Traverse all repo-arch pairs - for _repo in ${ARCHREPOS[@]}; do - for _arch in ${ARCHARCHES[@]}; do + for _repo in "${ARCHREPOS[@]}"; do + for _arch in "${ARCHARCHES[@]}"; do msg "Processing ${_repo}-${_arch}" db_file=$(get_repo_file ${_repo} ${_arch})${DBEXT} @@ -125,7 +125,7 @@ init() { rsync ${extra} --no-motd -rtlH \ --delay-updates \ --safe-links \ - ${WORKDIR}/${_repo}/os/${_arch}/ \ + "${WORKDIR}/${_repo}/os/${_arch}/" \ ${FTP_BASE}/${_repo}/os/${_arch}/ # Cleanup @@ -177,6 +177,12 @@ init() { unset blacklist whitelists _arch _repo repo_file } +fatal_error() { + local mesg=$1; shift + error "$mesg" "$@" + exit 1 +} + trap_exit() { local signal=$1; shift echo @@ -187,18 +193,17 @@ trap_exit() { source "$(dirname "$(readlink -e "$0")")/config" source "$(dirname "$(readlink -e "$0")")/db-sync.conf" -source "$(dirname "$(readlink -e "$0")")/libremessages" +source "$(dirname "$(readlink -e "$0")")/db-functions" # Check variables presence for var in DBEXT FILESEXT mirror mirrorpath WORKDIR BLACKLIST_FILE FTP_BASE ARCHSRCPOOLS ARCHPKGPOOLS; do - test -z "${!var}" && fatal_error "Empty ${var}" done # From makepkg set -E for signal in TERM HUP QUIT; do - trap "trap_exit $signal '%s signal caught. Exiting...' $signal" $signal + trap "trap_exit $signal '%s signal caught. Exiting...' $signal" $signal done trap 'trap_exit INT "Aborted by user! Exiting..."' INT trap 'trap_exit USR1 "An unknown error has occurred. Exiting..."' ERR |