From 9b5a17164cd9350b663a0514be9a8f001ed49058 Mon Sep 17 00:00:00 2001 From: Esteban Carnevale Date: Tue, 16 Dec 2014 15:54:56 -0300 Subject: libredbdiff-standalone: Improve whitespace --- libredbdiff-standalone | 92 +++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/libredbdiff-standalone b/libredbdiff-standalone index 71da50e..cb8b804 100755 --- a/libredbdiff-standalone +++ b/libredbdiff-standalone @@ -24,6 +24,7 @@ mirrorarch='http://mirrors.kernel.org/archlinux/$repo/os/$arch' repos="libre pcr libre-multilib nonprism" + error() { echo -e "Error. $@" > /dev/stderr ; exit 1; } help() { @@ -164,60 +165,59 @@ else fi # close "if [[ $update != 0 ]] ; then" if [[ $update == 0 ]] ; then + unset provides ver verarch + declare -Ax provides ver verarch -unset provides ver verarch -declare -Ax provides ver verarch - -expac_version_test() { -if ! pkgname="$(pacman -Qoq expac)" ; then - echo "The command expac could not be found installed. The package pcr/expac-relative 4-2.parabola1 (or later) must be installed." >&2 - exit 1 - elif [[ $pkgname == expac-git ]] ; then - true - elif [[ $pkgname == expac-relative ]] ; then - if [[ $(vercmp "$(expac %v expac-relative)" 4-2.parabola1) != -1 ]] ; then - echo "The version of expac-relative installed on the system is lower than needed." >&2 + expac_version_test() { + if ! pkgname="$(pacman -Qoq expac)" ; then + echo "The command expac could not be found installed. The package pcr/expac-relative 4-2.parabola1 (or later) must be installed." >&2 + exit 1 + elif [[ $pkgname == expac-git ]] ; then + true + elif [[ $pkgname == expac-relative ]] ; then + if [[ $(vercmp "$(expac %v expac-relative)" 4-2.parabola1) != -1 ]] ; then + echo "The version of expac-relative installed on the system is lower than needed." >&2 + exit 1 + fi + else + echo "expac command must be provided by pcr/expac-relative version 4-2.parabola1 (or later). This package must be installed." >&2 exit 1 fi - else - echo "expac command must be provided by pcr/expac-relative version 4-2.parabola1 (or later). This package must be installed." >&2 - exit 1 - fi -} + } -compare_pkgs() { - if [[ ${verarch["$pkgname"]} ]] ; then - cmp=$(vercmp ${ver["$pkgname"]} ${verarch["$pkgname"]}) - [[ $cmp -lt 0 ]] && echo "${pkgname} needs update from the Arch package of the same name. Versions: ${ver["$pkgname"]} - ${verarch["$pkgname"]}" - elif [[ ${provides["$pkgname"]} ]] ; then - for provide in ${provides["$pkgname"]} ; do - [[ ${verarch["$provide"]} ]] && { - cmp=$(vercmp "${ver["$pkgname"]}" "${verarch["$provide"]}") - [[ $cmp -lt 0 ]] && echo "${pkgname} may need update from provide candidate ${provide}. Versions: ${ver["$pkgname"]} - ${verarch["$provide"]}" - } - done - else - echo "Could not find candidate to compare ${pkgname}" - fi -} + compare_pkgs() { + if [[ ${verarch["$pkgname"]} ]] ; then + cmp=$(vercmp ${ver["$pkgname"]} ${verarch["$pkgname"]}) + [[ $cmp -lt 0 ]] && echo "${pkgname} needs update from the Arch package of the same name. Versions: ${ver["$pkgname"]} - ${verarch["$pkgname"]}" + elif [[ ${provides["$pkgname"]} ]] ; then + for provide in ${provides["$pkgname"]} ; do + [[ ${verarch["$provide"]} ]] && { + cmp=$(vercmp "${ver["$pkgname"]}" "${verarch["$provide"]}") + [[ $cmp -lt 0 ]] && echo "${pkgname} may need update from provide candidate ${provide}. Versions: ${ver["$pkgname"]} - ${verarch["$provide"]}" + } + done + else + echo "Could not find candidate to compare ${pkgname}" + fi + } -expac_version_test + expac_version_test -while read -a line ; do - verarch["${line[0]}"]="${line[1]}" -done < <(pacman --dbpath "${dbpatharch}" --config "${conffilearch}" -Ss | grep -v '^ ' | awk -F/ '{print $2}') + while read -a line ; do + verarch["${line[0]}"]="${line[1]}" + done < <(pacman --dbpath "${dbpatharch}" --config "${conffilearch}" -Ss | grep -v '^ ' | awk -F/ '{print $2}') -expac --config "${conffile}" -S '%r/%n %v %S' > /tmp/${progname}.parabola-packages + expac --config "${conffile}" -S '%r/%n %v %S' > /tmp/${progname}.parabola-packages -print_cmp() { - repo="$1" - awk -F/ -v repo="$repo" '$1 == repo {print $2}' /tmp/${progname}.parabola-packages | while read -a line ; do - ver["${line[0]}"]="${line[1]}" - provides[${line[0]}]="${line[@]:2}" - pkgname=${line[0]} - compare_pkgs - done -} + print_cmp() { + repo="$1" + awk -F/ -v repo="$repo" '$1 == repo {print $2}' /tmp/${progname}.parabola-packages | while read -a line ; do + ver["${line[0]}"]="${line[1]}" + provides[${line[0]}]="${line[@]:2}" + pkgname=${line[0]} + compare_pkgs + done + } if [[ ${repo_arg} ]] ; then print_cmp "${repo_arg}" -- cgit v1.2.3