Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
eepm
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
etersoft
eepm
Commits
b596a59f
Commit
b596a59f
authored
Jun 07, 2023
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
commit packed 3.57.7
parent
4250d6b2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
31 deletions
+35
-31
epm.sh
packed/epm.sh
+19
-16
serv.sh
packed/serv.sh
+16
-15
No files found.
packed/epm.sh
View file @
b596a59f
...
...
@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install
CONFIGDIR
=
$PROGDIR
/../etc
EPMVERSION
=
"3.57.
6
"
EPMVERSION
=
"3.57.
7
"
# package, single (file), pipe, git
EPMMODE
=
"package"
...
...
@@ -821,7 +821,6 @@ set_distro_info()
[
-n
"
$DISTRVENDOR
"
]
&&
return
0
DISTRVENDOR
=
internal_distr_info
export
DISTRVENDOR
# export pack of variables, see epm print info --print-eepm-env
[
-n
"
$verbose
"
]
&&
$DISTRVENDOR
--print-eepm-env
...
...
@@ -6007,7 +6006,7 @@ __epm_play_list()
local
extra
=
"
$2
"
local
i
local
IGNOREi586
local arch
=
"
$
DISTR
ARCH
"
local arch
=
"
$
SYSTEM
ARCH
"
[
"
$arch
"
=
"x86_64"
]
&&
IGNOREi586
=
''
||
IGNOREi586
=
1
if
[
-n
"
$short
"
]
;
then
...
...
@@ -11570,6 +11569,8 @@ init_alt_contents_index()
update_alt_contents_index
()
{
check_alt_contents_index
||
return
truncate
-s0
"
$ALT_CONTENTS_INDEX_LIST
"
# TODO: fix for Etersoft/LINUX@Etersoft
# TODO: fix for rsync
info
"Retrieving contents_index ..."
...
...
@@ -13807,28 +13808,30 @@ print_eepm_env()
{
cat
<<
EOF
# -d | --base-distro-name
export
DISTRNAME="
$(
echo
$DISTRIB_ID
)
"
DISTRNAME="
$(
echo
$DISTRIB_ID
)
"
# -v | --base-version
export DISTRVERSION="
$(
echo
"
$DISTRIB_RELEASE
"
)
"
# -a
export DISTRARCH="
$(
get_distro_arch
)
"
# -y | --service-manager
export DISTRCONTROL="
$(
get_service_manager
)
"
DISTRVERSION="
$(
echo
"
$DISTRIB_RELEASE
"
)
"
# distro dependent arch
DISTRARCH="
$(
get_distro_arch
)
"
# -s | --vendor-name
export
BASEDISTRNAME=
$(
pkgvendor
)
BASEDISTRNAME=
$(
pkgvendor
)
# --repo-name
export
DISTRREPONAME=
$(
print_repo_name
)
DISTRREPONAME=
$(
print_repo_name
)
# -a
SYSTEMARCH="
$(
get_arch
)
"
# -y | --service-manager
DISTRCONTROL="
$(
get_service_manager
)
"
# -g
export
PMTYPE="
$(
pkgmanager
)
"
PMTYPE="
$(
pkgmanager
)
"
# -p | --package-type
export
PKGFORMAT=
$(
pkgtype
)
PKGFORMAT=
$(
pkgtype
)
# -m
export
DISTRMEMORY="
$(
get_memory_size
)
"
DISTRMEMORY="
$(
get_memory_size
)
"
# TODO: remove?
export
PKGVENDOR=
$(
pkgvendor
)
export
RPMVENDOR=
$(
pkgvendor
)
PKGVENDOR=
$(
pkgvendor
)
RPMVENDOR=
$(
pkgvendor
)
EOF
...
...
packed/serv.sh
View file @
b596a59f
...
...
@@ -33,7 +33,7 @@ SHAREDIR=$PROGDIR
# will replaced with /etc/eepm during install
CONFIGDIR
=
$PROGDIR
/../etc
EPMVERSION
=
"3.57.
6
"
EPMVERSION
=
"3.57.
7
"
# package, single (file), pipe, git
EPMMODE
=
"package"
...
...
@@ -822,7 +822,6 @@ set_distro_info()
[
-n
"
$DISTRVENDOR
"
]
&&
return
0
DISTRVENDOR
=
internal_distr_info
export
DISTRVENDOR
# export pack of variables, see epm print info --print-eepm-env
[
-n
"
$verbose
"
]
&&
$DISTRVENDOR
--print-eepm-env
...
...
@@ -2609,28 +2608,30 @@ print_eepm_env()
{
cat
<<
EOF
# -d | --base-distro-name
export
DISTRNAME="
$(
echo
$DISTRIB_ID
)
"
DISTRNAME="
$(
echo
$DISTRIB_ID
)
"
# -v | --base-version
export DISTRVERSION="
$(
echo
"
$DISTRIB_RELEASE
"
)
"
# -a
export DISTRARCH="
$(
get_distro_arch
)
"
# -y | --service-manager
export DISTRCONTROL="
$(
get_service_manager
)
"
DISTRVERSION="
$(
echo
"
$DISTRIB_RELEASE
"
)
"
# distro dependent arch
DISTRARCH="
$(
get_distro_arch
)
"
# -s | --vendor-name
export
BASEDISTRNAME=
$(
pkgvendor
)
BASEDISTRNAME=
$(
pkgvendor
)
# --repo-name
export
DISTRREPONAME=
$(
print_repo_name
)
DISTRREPONAME=
$(
print_repo_name
)
# -a
SYSTEMARCH="
$(
get_arch
)
"
# -y | --service-manager
DISTRCONTROL="
$(
get_service_manager
)
"
# -g
export
PMTYPE="
$(
pkgmanager
)
"
PMTYPE="
$(
pkgmanager
)
"
# -p | --package-type
export
PKGFORMAT=
$(
pkgtype
)
PKGFORMAT=
$(
pkgtype
)
# -m
export
DISTRMEMORY="
$(
get_memory_size
)
"
DISTRMEMORY="
$(
get_memory_size
)
"
# TODO: remove?
export
PKGVENDOR=
$(
pkgvendor
)
export
RPMVENDOR=
$(
pkgvendor
)
PKGVENDOR=
$(
pkgvendor
)
RPMVENDOR=
$(
pkgvendor
)
EOF
...
...
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