FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > ArchLinux > ArchLinux Pacman Development

 
 
LinkBack Thread Tools
 
Old 03-09-2012, 02:18 PM
Dave Reisner
 
Default makepkg: the rhs in string comparisons should be quoted

On Fri, Mar 09, 2012 at 05:59:04PM +1000, Allan McRae wrote:
> Signed-off-by: Allan McRae <allan@archlinux.org>
> ---

ack.

> scripts/makepkg.sh.in | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 8763ffb..601c7e2 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -311,7 +311,7 @@ in_opt_array() {
>
> local opt
> for opt in "$@"; do
> - if [[ $opt = $needle ]]; then
> + if [[ $opt = "$needle" ]]; then
> echo 'y' # Enabled
> return
> elif [[ $opt = "!$needle" ]]; then
> @@ -333,7 +333,7 @@ in_array() {
> local needle=$1; shift
> local item
> for item in "$@"; do
> - [[ $item = $needle ]] && return 0 # Found
> + [[ $item = "$needle" ]] && return 0 # Found
> done
> return 1 # Not Found
> }
> @@ -357,7 +357,7 @@ get_downloadclient() {
> local i
> for i in "${DLAGENTS[@]}"; do
> local handler="${i%%::*}"
> - if [[ $proto = $handler ]]; then
> + if [[ $proto = "$handler" ]]; then
> local agent="${i##*::}"
> break
> fi
> @@ -557,7 +557,7 @@ download_sources() {
> local url=$(get_url "$netfile")
>
> # if we get here, check to make sure it was a URL, else fail
> - if [[ $file = $url ]]; then
> + if [[ $file = "$url" ]]; then
> error "$(gettext "%s was not found in the build directory and is not a URL.")" "$file"
> exit 1 # $E_MISSING_FILE
> fi
> @@ -683,7 +683,7 @@ check_checksums() {
> local expectedsum=$(tr '[:upper:]' '[:lower:]' <<< "${integrity_sums[$idx]}")
> local realsum="$(openssl dgst -${integ} "$file")"
> realsum="${realsum##* }"
> - if [[ $expectedsum = $realsum ]]; then
> + if [[ $expectedsum = "$realsum" ]]; then
> printf -- "$(gettext "Passed")
" >&2
> else
> printf -- "$(gettext "FAILED")
" >&2
> @@ -842,7 +842,7 @@ extract_sources() {
>
> local ret=0
> msg2 "$(gettext "Extracting %s with %s")" "$file" "$cmd"
> - if [[ $cmd = bsdtar ]]; then
> + if [[ $cmd = "bsdtar" ]]; then
> $cmd -xf "$file" || ret=$?
> else
> rm -f "${file%.*}"
> @@ -981,7 +981,7 @@ tidy_install() {
> msg2 "$(gettext "Purging unwanted files...")"
> local pt
> for pt in "${PURGE_TARGETS[@]}"; do
> - if [[ ${pt} = ${pt///} ]]; then
> + if [[ ${pt} = "${pt///}" ]]; then
> find . -type f -name "${pt}" -exec rm -f -- '{}' ;
> else
> rm -f ${pt}
> @@ -1025,7 +1025,7 @@ tidy_install() {
> done
> fi
>
> - if [[ $(check_option strip) = y ]]; then
> + if [[ $(check_option strip) = "y" ]]; then
> msg2 "$(gettext "Stripping unneeded symbols from binaries and libraries...")"
> # make sure library stripping variables are defined to prevent excess stripping
> [[ -z ${STRIP_SHARED+x} ]] && STRIP_SHARED="-S"
> @@ -1207,7 +1207,7 @@ write_pkginfo() {
> for it in "${packaging_options[@]}"; do
> local ret="$(check_option $it)"
> if [[ $ret != "?" ]]; then
> - if [[ $ret = y ]]; then
> + if [[ $ret = "y" ]]; then
> echo "makepkgopt = $it"
> else
> echo "makepkgopt = !$it"
> @@ -1370,7 +1370,7 @@ create_srcpackage() {
>
> local file
> for file in "${source[@]}"; do
> - if [[ "$file" == $(get_filename "$file") ]] || (( SOURCEONLY == 2 )); then
> + if [[ "$file" = "$(get_filename "$file")" ]] || (( SOURCEONLY == 2 )); then
> local absfile
> absfile=$(get_filepath "$file") || missing_source_file "$file"
> msg2 "$(gettext "Adding %s...")" "${absfile##*/}"
> @@ -1580,7 +1580,7 @@ check_sanity() {
> known=0
> # check if option matches a known option or its inverse
> for kopt in ${packaging_options[@]} ${other_options[@]}; do
> - if [[ ${i} = ${kopt} || ${i} = "!${kopt}" ]]; then
> + if [[ ${i} = "${kopt}" || ${i} = "!${kopt}" ]]; then
> known=1
> fi
> done
> @@ -1704,7 +1704,7 @@ devel_check() {
> # Do not update pkgver if --holdver is set, when building a source package, repackaging,
> # reading PKGBUILD from pipe (-f), or if we cannot write to the file (-w)
> if (( HOLDVER || SOURCEONLY || REPKG )) ||
> - [[ ! -f $BUILDFILE || ! -w $BUILDFILE || $BUILDFILE = /dev/stdin ]]; then
> + [[ ! -f $BUILDFILE || ! -w $BUILDFILE || $BUILDFILE = "/dev/stdin" ]]; then
> return
> fi
>
> --
> 1.7.9.3
>
>
 

Thread Tools




All times are GMT. The time now is 09:43 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org