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
ac1b00f2
Commit
ac1b00f2
authored
Jul 10, 2009
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small code cleanup
parent
c0dce4e8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
rpmbs
bin/rpmbs
+1
-2
common
share/eterbuild/functions/common
+5
-0
etersoft
share/eterbuild/functions/etersoft
+4
-2
No files found.
bin/rpmbs
View file @
ac1b00f2
...
...
@@ -124,8 +124,7 @@ rpmbs_copying_built()
{
if
[
-n
"
$ETERDESTSRPM
"
]
;
then
echog
"Copying package(s) in
\$
ETERDESTSRPM"
if
echo
"
$ETERDESTSRPM
"
|
grep
-q
":"
;
then
# if ssh target
if
is_ssh_target
"
$ETERDESTSRPM
"
;
then
scp
$LISTBUILT
$ETERDESTSRPM
||
echog
"Error during copying"
else
mkdir
-p
$ETERDESTSRPM
||
echog
"Error mkdir
$ETERDESTSRPM
"
...
...
share/eterbuild/functions/common
View file @
ac1b00f2
...
...
@@ -176,3 +176,8 @@ make_temp_file()
fi
}
is_ssh_target
()
{
echo
"
$1
"
|
grep
-q
":"
}
share/eterbuild/functions/etersoft
View file @
ac1b00f2
...
...
@@ -9,10 +9,12 @@ get_etersoft_srpm_path()
local
SOURCE
local
ALPHA
=
$2
local
SOURCEFTP
=
$(
eval_spec
$1
| get_var
"Source"
)
if
[
-z
"
$SOURCEFTP
"
]
;
then
build_rpms_name
$1
SOURCEFTP
=
$(
cat
$1
| get_var
"#Source"
| subst_namever
)
fi
[
-n
"
$SOURCEFTP
"
]
||
fatal
"Can't get Source from spec"
SOURCEFTP
=
$(
dirname
"
$SOURCEFTP
"
)
...
...
@@ -26,13 +28,13 @@ get_etersoft_srpm_path()
echo
$SOURCEFTP
|
grep
-q
"tarball
\$
"
&&
SOURCEFTP
=
$(
dirname
"
$SOURCEFTP
"
)
# translate ftp to local path
SOURCE
=
$(
echo
"
$SOURCEFTP
"
|
sed
-e
"s|.*://.*
$COMPANYFTP
|
$TARGETFTPBASE
|g"
)
[
-d
"
$SOURCE
"
]
||
fatal
"Can't locate
$SOURCE
dir, translated from
$SOURCEFTP
"
# rewrite V.E.R./sources with $ALPHA/sources
if
[
-n
"
$ALPHA
"
]
;
then
SOURCE
=
$(
dirname
$SOURCE
)
SOURCE
=
$(
dirname
$SOURCE
)
/
$ALPHA
/sources
fi
mkdir
-p
$SOURCE
||
fatal
"Can't create
$SOURCE
"
echo
$SOURCE
}
...
...
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