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
0af4f5db
You need to sign in or sign up before continuing.
Commit
0af4f5db
authored
Jul 22, 2017
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move get_ext to common part and use erc for it
parent
90cfbf8a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
rpmgs
bin/rpmgs
+0
-5
etersoft-build-utils.spec
etersoft-build-utils.spec
+1
-1
common
share/eterbuild/functions/common
+11
-0
No files found.
bin/rpmgs
View file @
0af4f5db
...
...
@@ -66,11 +66,6 @@ check_tarball()
erc
-q
check
"
$1
"
}
get_ext
()
{
rhas
"
$1
"
"
\.
"
&&
echo
"
$1
"
|
sed
-e
"s|.*
\.
||"
|
grep
-v
"/"
}
# Args: URL TARGET
download_to
()
{
...
...
etersoft-build-utils.spec
View file @
0af4f5db
...
...
@@ -24,7 +24,7 @@ BuildRequires: rpm-build-compat >= %altcompat_ver
Requires: giter >= 1.10
Requires: eepm >= 1.7.2
Requires: erc >= 0.
8
Requires: erc >= 0.
9.2
Requires: rpm-build
Requires: rpm-build-compat >= %altcompat_ver
...
...
share/eterbuild/functions/common
View file @
0af4f5db
...
...
@@ -158,6 +158,9 @@ DISTRVENDOR=$(realpath $ETERBUILDBIN/../../rpm-build-altlinux-compat/bin/distr_v
EPMCMD
=
$(
realpath
$ETERBUILDBIN
/../../eepm/bin/epm 2>/dev/null
)
[
-x
"
$EPMCMD
"
]
||
EPMCMD
=
epm
ERCCMD
=
$(
realpath
$ETERBUILDBIN
/../../erc/bin/erc 2>/dev/null
)
[
-x
"
$ERCCMD
"
]
||
ERCCMD
=
erc
print_list
()
{
local
i
...
...
@@ -433,6 +436,14 @@ check_key()
check_ssh_key
}
get_ext
()
{
# first check if it is archive
$ERCCMD
type
"
$1
"
&&
return
# default code, it broken sequenced extensions (like .tar.gz)
rhas
"
$1
"
"
\.
"
&&
echo
"
$1
"
|
sed
-e
"s|.*
\.
||"
|
grep
-v
"/"
}
make_temp_file
()
{
# Workaround about broken mktemp
...
...
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