cookutils rev 1099

modules/pack: find_vars(): fix typo
author Aleksej Bobylev <al.bobylev@gmail.com>
date Thu Nov 29 15:55:14 2018 +0200 (2018-11-29)
parents cd73759b1e1c
children 33dbe879cc21
files modules/pack
line diff
     1.1 --- a/modules/pack	Tue Nov 27 11:36:59 2018 +0200
     1.2 +++ b/modules/pack	Thu Nov 29 15:55:14 2018 +0200
     1.3 @@ -313,20 +313,20 @@
     1.4  	SHORT_DESC="${SHORT_DESC//\"/\\\"}"
     1.5  
     1.6  	# Mandatory variables
     1.7 -	cat <<EOF
     1.8 -$signature
     1.9 +	cat <<-EOF
    1.10 +		$signature
    1.11  
    1.12 -PACKAGE="$PACKAGE"
    1.13 -VERSION="$VERSION"
    1.14 -EOF
    1.15 +		PACKAGE="$PACKAGE"
    1.16 +		VERSION="$VERSION"
    1.17 +	EOF
    1.18  	[ -n "$EXTRAVERSION"    ] && echo "EXTRAVERSION=\"$EXTRAVERSION\""
    1.19 -	cat <<EOF
    1.20 -CATEGORY="$CATEGORY"
    1.21 -SHORT_DESC="$SHORT_DESC"
    1.22 -MAINTAINER="$MAINTAINER"
    1.23 -LICENSE="$LICENSE"
    1.24 -WEB_SITE="$WEB_SITE"
    1.25 -EOF
    1.26 +	cat <<-EOF
    1.27 +		CATEGORY="$CATEGORY"
    1.28 +		SHORT_DESC="$SHORT_DESC"
    1.29 +		MAINTAINER="$MAINTAINER"
    1.30 +		LICENSE="$LICENSE"
    1.31 +		WEB_SITE="$WEB_SITE"
    1.32 +	EOF
    1.33  
    1.34  	# Optional variables
    1.35  	[ -n "$TAGS"            ] && echo "TAGS=\"$TAGS\""                 | tr -ds '\t' ' '
    1.36 @@ -471,7 +471,7 @@
    1.37  	local var=$1
    1.38  	local pkg=$(echo -n $2       | tr -c 'a-zA-Z0-9' '_')
    1.39  	local end=$(echo -n ${2#$basepkg-} | tr -c 'a-zA-Z0-9' '_')
    1.40 -	if [ "$pkg" == "$basepkg" ]; then
    1.41 +	if [ "$2" == "$basepkg" ]; then
    1.42  		eval out="\$${var}_$pkg"
    1.43  		[ -n "$out" ] || eval out="\$${var}_std"
    1.44  	else