Commit f5ed266b authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix get tar rule from .gear/rules

parent bd890323
......@@ -276,7 +276,7 @@ do
echo "Run svn rebase from $GETSOURCESVN"
docmd git svn rebase
elif is_gear ; then
CURNAME=$(get_tardir_from_rules) || fatal "There is no tar: line in gear rules file"
CURNAME=$(get_tardir_from_rules) || fatal "There is no 'tar:' line in gear rules file or 'tar: .' used"
test -d "$CURNAME" || CURNAME=$(get_tarballname "$spec")
test -d "$CURNAME" || CURNAME=$BASENAME
gear_update_from_tarball "$RPMSOURCEDIR/$FTB" "$CURNAME" $FORCEDOWNLOAD
......
......@@ -292,7 +292,7 @@ get_tardir_from_rules()
{
local rules=$(get_gear_rules)
assert_var rules
local dir=$(grep "tar: " $rules | sed -e "s|tar: *||g
local dir=$(grep "tar.*: " $rules | sed -e "s|tar.*: *||g
s| .*||g")
[ "$dir" = "." ] || [ -z "$dir" ] && return 1
echo "$dir"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment