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
f5ed266b
Commit
f5ed266b
authored
Oct 21, 2015
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix get tar rule from .gear/rules
parent
bd890323
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
rpmgs
bin/rpmgs
+1
-1
common
share/eterbuild/functions/common
+1
-1
No files found.
bin/rpmgs
View file @
f5ed266b
...
...
@@ -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
...
...
share/eterbuild/functions/common
View file @
f5ed266b
...
...
@@ -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
"
...
...
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