Skip to content

E
etersoft-build-utils
Commit 3feb83fe authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

get spec path if spec is defined in gear rules

parent 8ae854cd
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
share/eterbuild/functions/spec
View file @ 3feb83fe
...@@ -186,6 +186,12 @@ set_specdir() ...@@ -186,6 +186,12 @@ set_specdir()
fi fi
} }
get_gear_rule_spec()
{
local SPEC="$(grep "^spec:" $(get_root_git_dir)/.gear/rules | cut -d" " -f2)"
test -r "$(get_root_git_dir)/$SPEC" && echo $(get_root_git_dir)/$SPEC
}
# search for gear spec # search for gear spec
get_gear_spec() get_gear_spec()
{ {
...@@ -194,7 +200,7 @@ get_gear_spec() ...@@ -194,7 +200,7 @@ get_gear_spec()
is_gear && trySpec=$(echo *.spec) is_gear && trySpec=$(echo *.spec)
# if not in local dir, check spec in git root dir # if not in local dir, check spec in git root dir
[ -f "$trySpec" ] || trySpec=`echo $(get_root_git_dir)/*.spec` [ -f "$trySpec" ] || trySpec=`echo $(get_root_git_dir)/*.spec`
[ -f "$trySpec" ] || trySpec=`echo $(get_root_git_dir)/.gear/*.spec` [ -f "$trySpec" ] || trySpec=$(get_gear_rule_spec)
# printout nothing if can't get spec # printout nothing if can't get spec
[ -f "$trySpec" ] || trySpec="" [ -f "$trySpec" ] || trySpec=""
echo $trySpec echo $trySpec
......
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