Commit 68818a5e authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmgs: get dir name from gear rules

parent 6ad4d475
......@@ -357,9 +357,9 @@ do
echo "Run svn rebase from $GETSOURCESVN"
docmd git svn rebase
elif is_gear ; then
CURNAME=$BASENAME
echo $CURNAME
CURNAME=$(get_tardir_from_rules) || fatal "There is no tar: line in gear rules file"
test -d "$CURNAME" || CURNAME=$(get_tarballname "$spec")
test -d "$CURNAME" || CURNAME=$BASENAME
gear_update_from_tarball "$RPMSOURCEDIR/$FTB" "$CURNAME" $FORCEDOWNLOAD
rm -f "$RPMSOURCEDIR/$FTB"
docmd git commit -m "just import $FTB with rpmgs script"
......
......@@ -266,7 +266,7 @@ get_gear_rules()
local DIR="$1"
[ -z "$IGNOREGEAR" ] || return 1
[ -f "$DIR" ] && DIR=$(dirname "$DIR")
[ -n "$DIR" ] && cd $DIR
[ -n "$DIR" ] && cd "$DIR"
local GITDIR=$(get_root_git_dir)
[ -n "$DIR" ] && cd - >/dev/null
local rules="$GITDIR/.gear/rules"
......@@ -282,6 +282,16 @@ is_gear()
get_gear_rules $@ >/dev/null
}
get_tardir_from_rules()
{
local rules=$(get_gear_rules)
assert_var rules
local dir=$(grep "tar: " $rules | sed -e "s|tar: *||g
s| .*||g")
[ "$dir" = "." ] || [ -z "$dir" ] && return 1
echo "$dir"
}
filter_gear_name()
{
sed -e "s|\+|plus|g"
......
......@@ -61,4 +61,7 @@ check_get_version python-larch
rm -f $SPEC
echo "Tarball"
get_tardir_from_rules || echo "No tarball"
echo "DONE"
\ No newline at end of file
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