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
53af3a3c
Commit
53af3a3c
authored
May 20, 2023
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
functions/common: use DISTRVENDOR from EPMCMD
parent
cef1aefa
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
4 deletions
+8
-4
common
share/eterbuild/functions/common
+8
-4
No files found.
share/eterbuild/functions/common
View file @
53af3a3c
...
...
@@ -171,13 +171,16 @@ fi
# assert_var ETERBUILDBIN
#DISTRVENDOR=$(realpath $ETERBUILDBIN/../../rpm-build-altlinux-compat/bin/distr_vendor 2>/dev/null)
DISTRVENDOR
=
$(
realpath
$ETERBUILDBIN
/../../distro_info/bin/distro_info 2>/dev/null
)
[
-x
"
$DISTRVENDOR
"
]
||
DISTRVENDOR
=
distro_info
which
$DISTRVENDOR
>
/dev/null 2>/dev/null
||
DISTRVENDOR
=
distr_info
#DISTRVENDOR=$(realpath $ETERBUILDBIN/../../eepm/bin/distr_info 2>/dev/null)
#[ -x "$DISTRVENDOR" ] || DISTRVENDOR=$(realpath $ETERBUILDBIN/../../distro_info/bin/distro_info 2>/dev/null)
#[ -x "$DISTRVENDOR" ] || DISTRVENDOR=distro_info
#which $DISTRVENDOR >/dev/null 2>/dev/null || DISTRVENDOR=distr_info
EPMCMD
=
$(
realpath
$ETERBUILDBIN
/../../eepm/bin/epm 2>/dev/null
)
[
-x
"
$EPMCMD
"
]
||
EPMCMD
=
epm
DISTRVENDOR
=
"
$EPMCMD
print info"
# TODO: ERCCMD="$EPMCMD tool erc"
ERCCMD
=
$(
realpath
$ETERBUILDBIN
/../../erc/bin/erc 2>/dev/null
)
[
-x
"
$ERCCMD
"
]
||
ERCCMD
=
erc
...
...
@@ -352,7 +355,7 @@ fi
set_gear_host
# FIXME: use epm print info --print-eepm-env
# Used DISTRNAME
set_target_pkg_env
()
{
...
...
@@ -382,6 +385,7 @@ set_target_pkg_env()
detect_target_env
()
{
MENVARG
=
""
# FIXME: use epm print info --print-eepm-env
[
-n
"
$DISTRNAME
"
]
||
DISTRNAME
=
$(
$DISTRVENDOR
-d
)
[
-n
"
$DISTRVERSION
"
]
||
DISTRVERSION
=
$(
$DISTRVENDOR
-v
)
[
-n
"
$DISTRVERSION
"
]
||
fatal
"can't get distro version from
$DISTRVENDOR
, write lav@etersoft.ru"
...
...
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