Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
etersoft-build-utils
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
korinf
etersoft-build-utils
Commits
68818a5e
Commit
68818a5e
authored
Aug 21, 2015
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rpmgs: get dir name from gear rules
parent
6ad4d475
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
rpmgs
bin/rpmgs
+2
-2
common
share/eterbuild/functions/common
+11
-1
get_tarballname.sh
tests/get_tarballname.sh
+4
-0
No files found.
bin/rpmgs
View file @
68818a5e
...
...
@@ -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"
...
...
share/eterbuild/functions/common
View file @
68818a5e
...
...
@@ -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"
...
...
tests/get_tarballname.sh
View file @
68818a5e
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment