cookutils rev 1023
cook: fix regression in packit() made by me in commit #1020
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Sun Jan 14 17:12:15 2018 +0200 (2018-01-14) |
parents | ddfe8a9e3dbf |
children | be4a05be1a6f |
files | cook |
line diff
1.1 --- a/cook Wed Jan 10 03:06:07 2018 +0200 1.2 +++ b/cook Sun Jan 14 17:12:15 2018 +0200 1.3 @@ -882,13 +882,13 @@ 1.4 title 'Pack: %s' "$PACKAGE $VERSION$arch" 1.5 1.6 # Get set name for specified package from $SPLIT variable 1.7 - local set=$(echo $SPLIT \ 1.8 + local set=$(echo -n $SPLIT \ 1.9 | awk -vpkg="$PACKAGE" ' 1.10 BEGIN { RS = " "; FS = ":"; } 1.11 - { if ($1 == pkg && $2) { print "-" $2; exit; } }') 1.12 + { if ($1 == pkg && $2 != "") { print "-" $2; exit; } }') 1.13 # Change set, make filelist and folderlist for new set 1.14 - export src="$WOK/$pkg/source/$PACKAGE-$VERSION$set" 1.15 - export install="$WOK/$pkg/install$set" 1.16 + export src="$src$set" 1.17 + export install="$install$set" 1.18 export DESTDIR="$install" 1.19 1.20 if grep -q ^genpkg_rules $receipt; then