[pacman-dev] [PATCH 2/3] pkgdelta: clean up quoting

Dan McGee dpmcgee at gmail.com
Wed Sep 28 13:54:19 EDT 2011


On Wed, Sep 28, 2011 at 11:58 AM, lolilolicon <lolilolicon at gmail.com> wrote:
> Always quote the righthand side of expression when the == or != operator
> is used, unless intended as a pattern.
+1.
> Also, remove unnecessary quoting in variable assignments.
-1. Please don't do this.

> Signed-off-by: lolilolicon <lolilolicon at gmail.com>
> ---
>  scripts/pkgdelta.sh.in |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in
> index a0e3cee..c53098a 100644
> --- a/scripts/pkgdelta.sh.in
> +++ b/scripts/pkgdelta.sh.in
> @@ -85,25 +85,25 @@ create_xdelta()
>        deltafile
>
>        read_pkginfo "$oldfile" || return 1
> -       oldname="$pkgname"
> -       oldver="$pkgver"
> -       oldarch="$arch"
> +       oldname=$pkgname
> +       oldver=$pkgver
> +       oldarch=$arch
>        read_pkginfo "$newfile" || return 1
> -       newname="$pkgname"
> -       newver="$pkgver"
> -       newarch="$arch"
> +       newname=$pkgname
> +       newver=$pkgver
> +       newarch=$arch
>
> -       if [[ $oldname != $newname ]]; then
> +       if [[ $oldname != "$newname" ]]; then
>                error "$(gettext "The package names don't match : '%s' and '%s'")"
> "$oldname" "$newname"
>                return 1
>        fi
>
> -       if [[ $oldarch != $newarch ]]; then
> +       if [[ $oldarch != "$newarch" ]]; then
>                error "$(gettext "The package architectures don't match : '%s' and
> '%s'")" "$oldarch" "$newarch"
>                return 1
>        fi
>
> -       if [[ $oldver == $newver ]]; then
> +       if [[ $oldver == "$newver" ]]; then
>                error "$(gettext "Both packages have the same version : '%s'")" "$newver"
>                return 1
>        fi
> --
> 1.7.6.4
>
>


More information about the pacman-dev mailing list