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
8278dc03
Commit
8278dc03
authored
Nov 26, 2019
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Plain Diff
backported to p8 as 3.1.2-alt0.M80P.1 (with rpmbph script)
parents
6dafd74d
73e1eca1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
292 additions
and
97 deletions
+292
-97
distr_info
bin/distr_info
+89
-32
epm
bin/epm
+6
-2
epm-addrepo
bin/epm-addrepo
+2
-2
epm-checksystem
bin/epm-checksystem
+7
-0
epm-clean
bin/epm-clean
+3
-0
epm-dedup
bin/epm-dedup
+1
-1
epm-download
bin/epm-download
+3
-0
epm-install
bin/epm-install
+6
-8
epm-query
bin/epm-query
+8
-4
epm-query_file
bin/epm-query_file
+2
-2
epm-reinstall
bin/epm-reinstall
+3
-0
epm-release_upgrade
bin/epm-release_upgrade
+1
-0
epm-remove
bin/epm-remove
+6
-7
epm-removerepo
bin/epm-removerepo
+14
-3
epm-requires
bin/epm-requires
+5
-0
epm-sh-altlinux
bin/epm-sh-altlinux
+9
-1
epm-sh-functions
bin/epm-sh-functions
+7
-10
epm-site
bin/epm-site
+4
-0
epm-upgrade
bin/epm-upgrade
+20
-0
epm-whatdepends
bin/epm-whatdepends
+3
-0
serv
bin/serv
+11
-11
serv-edit
bin/serv-edit
+33
-0
eepm.spec
eepm.spec
+23
-2
epm.sh
packed/epm.sh
+0
-0
serv.sh
packed/serv.sh
+26
-12
No files found.
bin/distr_info
View file @
8278dc03
#!/bin/sh
# Author: Vitaly Lipatov <lav@etersoft.ru>
# 2007, 2009, 2010, 2012, 2016, 2017, 2018 (c) Etersoft
# 2007-2018 Public domain
# Detect the distro and version
# Welcome to send updates!
# 2007-2019 (c) Vitaly Lipatov <lav@etersoft.ru>
# 2007-2019 (c) Etersoft
# 2007-2019 Public domain
# You can set ROOTDIR to root system dir
#ROOTDIR=
...
...
@@ -124,7 +121,7 @@ if distro altlinux-release ; then
elif
has
"ALT Linux 8."
;
then
DISTRIB_RELEASE
=
"p8"
elif
has
"ALT .*8.[0-9]"
;
then
DISTRIB_RELEASE
=
"p8"
elif
has
"ALT .*9.[0-9]"
;
then
DISTRIB_RELEASE
=
"p9"
elif
has
"ALT p9
p9
"
;
then
DISTRIB_RELEASE
=
"p9"
elif
has
"ALT p9 "
;
then
DISTRIB_RELEASE
=
"p9"
elif
has
"Simply Linux 6."
;
then
DISTRIB_RELEASE
=
"p6"
elif
has
"Simply Linux 7."
;
then
DISTRIB_RELEASE
=
"p7"
elif
has
"Simply Linux 8."
;
then
DISTRIB_RELEASE
=
"p8"
...
...
@@ -138,12 +135,7 @@ if distro altlinux-release ; then
elif
has
"ALT Linux 5.0"
;
then
DISTRIB_RELEASE
=
"5.0"
elif
has
"ALT Linux 4.1"
;
then
DISTRIB_RELEASE
=
"4.1"
elif
has
"ALT Linux 4.0"
;
then
DISTRIB_RELEASE
=
"4.0"
elif
has Walnut
;
then
DISTRIB_RELEASE
=
"4.0"
elif
has Hypericum
;
then
DISTRIB_RELEASE
=
"p8"
elif
has
"starter kit"
;
then
DISTRIB_RELEASE
=
"p8"
elif
has 20070810
;
then
DISTRIB_RELEASE
=
"4.0"
elif
has Ajuga
;
then
DISTRIB_RELEASE
=
"4.0"
elif
has 20050723
;
then
DISTRIB_RELEASE
=
"3.0"
elif
has Citron
;
then
DISTRIB_RELEASE
=
"2.4"
fi
...
...
@@ -413,6 +405,9 @@ case "$DIST_BIT" in
'aarch64'
)
DIST_BIT
=
"64"
;;
'e2k'
)
DIST_BIT
=
"64"
;;
# 'pa_risc' | 'pa-risc') # Are some of these 64bit? Least not all...
# BIT="64"
# ;;
...
...
@@ -449,31 +444,85 @@ get_memory_size() {
echo
$detected
}
print_name_version
()
{
[
-n
"
$DISTRIB_RELEASE
"
]
&&
echo
$DISTRIB_ID
/
$DISTRIB_RELEASE
||
echo
$DISTRIB_ID
}
get_virt
()
{
local
VIRT
local
SDCMD
SDCMD
=
$(
which systemd-detect-virt 2>/dev/null
)
if
[
-n
"
$SDCMD
"
]
;
then
VIRT
=
"
$(
$SDCMD
)
"
[
"
$VIRT
"
=
"none"
]
&&
echo
"(host system)"
&&
return
[
-z
"
$VIRT
"
]
&&
echo
"(unknown)"
&&
return
echo
"
$VIRT
"
&&
return
fi
if
[
-r
/proc/user_beancounters
]
;
then
echo
"openvz"
&&
return
fi
echo
"(unknown)"
# TODO: check for openvz
}
# https://unix.stackexchange.com/questions/196166/how-to-find-out-if-a-system-uses-sysv-upstart-or-systemd-initsystem
get_service_manager
()
{
[
-d
/run/systemd/system
]
&&
echo
"systemd"
&&
return
[
-d
/usr/share/upstart
]
&&
echo
"upstart"
&&
return
[
-d
/etc/init.d
]
&&
echo
"sysvinit"
&&
return
echo
"(unknown)"
}
print_total_info
()
{
cat
<<
EOF
distro_info total information (run with -h to get help):
Distro name and version (-e):
$(
print_name_version
)
Packaging system (-p):
$(
pkgtype
)
Running service manager (-y):
$(
get_service_manager
)
Virtualization (-i):
$(
get_virt
)
CPU Architecture (-a):
$(
get_arch
)
CPU norm register size (-b):
$(
get_bit_size
)
System memory size (MB) (-m):
$(
get_memory_size
)
Base OS name (-o):
$(
get_base_os_name
)
Build system distro name (-s):
$(
pkgvendor
)
Build system vendor name (-n):
$(
rpmvendor
)
EOF
}
case
$1
in
-h
)
echo
"distro_info - distro name and version detection"
echo
"Usage: distro_info [options] [args]"
echo
"Options:"
echo
" -a - print hardware architecture"
echo
" -b - print size of arch bit (32/64)"
echo
" -d - print distro name"
echo
" -e - print full name of distro with version"
echo
" -i - print virtualization type"
echo
" -h - this help"
echo
" -m - print system memory size (in MB)"
echo
" -n [SystemName] - print vendor name (as _vendor macros in rpm)"
echo
" -o - print base OS name"
echo
" -p [SystemName] - print type of the packaging system"
echo
" -s [SystemName] - print name of distro for build system (like in the package release name)"
ecgi
" -y - print running service manager"
echo
" -v - print version of distro"
echo
" -V - print the utility version"
echo
"Run without args to print all information."
exit
0
;;
-p
)
# override DISTRIB_ID
test
-n
"
$2
"
&&
DISTRIB_ID
=
"
$2
"
pkgtype
exit
0
;;
-h
)
echo
"distr_vendor - system name and version detection"
echo
"Usage: distr_vendor [options] [args]"
echo
"-p [SystemName] - print type of packaging system"
echo
"-d - print distro name"
echo
"-a - print hardware architecture"
echo
"-b - print size of arch bit (32/64)"
echo
"-m - print system memory size (in MB)"
echo
"-o - print base os name"
echo
"-v - print version of distro"
echo
"-e - print full name of distro with version (by default)"
echo
"-s [SystemName] - print name of distro for build system (like in the package release name)"
echo
"-n [SystemName] - print vendor name (as _vendor macros in rpm)"
echo
"-V - print the version of
$0
"
echo
"-h - this help"
exit
0
;;
-d
)
echo
$DISTRIB_ID
;;
...
...
@@ -483,6 +532,9 @@ case $1 in
-b
)
get_bit_size
;;
-i
)
get_virt
;;
-m
)
get_memory_size
;;
...
...
@@ -504,13 +556,18 @@ case $1 in
rpmvendor
exit
0
;;
-y
)
get_service_manager
;;
-V
)
echo
"201
71010
"
echo
"201
91121
"
exit
0
;;
-e
)
print_name_version
;;
*
)
# if run without args, just printout Name/Version of the current system
[
-n
"
$DISTRIB_RELEASE
"
]
&&
echo
$DISTRIB_ID
/
$DISTRIB_RELEASE
||
echo
$DISTRIB_ID
print_total_info
;;
esac
bin/epm
View file @
8278dc03
...
...
@@ -66,7 +66,7 @@ $(get_help HELPOPT)
print_version
()
{
echo
"EPM package manager version @VERSION@"
echo
"Running on
$(
$DISTRVENDOR
)
('
$PMTYPE
' package manager uses '
$PKGFORMAT
' package format)"
echo
"Running on
$(
$DISTRVENDOR
-e
)
('
$PMTYPE
' package manager uses '
$PKGFORMAT
' package format)"
echo
"Copyright (c) Etersoft 2012-2019"
echo
"This program may be freely redistributed under the terms of the GNU AGPLv3."
}
...
...
@@ -83,6 +83,7 @@ noremove=
dryrun
=
force
=
repack
=
inscript
=
scripts
=
short
=
direct
=
...
...
@@ -352,6 +353,9 @@ check_option()
--noremove
|
--no-remove
)
# HELPOPT: exit if any packages are to be removed during upgrade
noremove
=
"--no-remove"
;;
--no-stdin
|
--inscript
)
# HELPOPT: don't read from stdin for epm args
inscript
=
1
;;
--dry-run
|
--simulate
|
--just-print
|
-recon--no-act
)
# HELPOPT: print only (autoremove/autoorphans/remove only)
dryrun
=
"--dry-run"
;;
...
...
@@ -411,7 +415,7 @@ for opt in "$@" ; do
done
# if input is not console and run script from file, get pkgs from stdin too
if
!
inputisatty
&&
[
-n
"
$PROGDIR
"
]
;
then
if
[
!
-n
"
$inscript
"
]
&&
!
inputisatty
&&
[
-n
"
$PROGDIR
"
]
;
then
for
opt
in
$(
withtimeout 2
cat
)
;
do
# FIXME: do not work
# workaround against # yes | epme
...
...
bin/epm-addrepo
View file @
8278dc03
...
...
@@ -94,7 +94,7 @@ __epm_addrepo_altlinux()
assure_exists apt-repo
if
tasknumber
"
$repo
"
>
/dev/null
;
then
sudocmd
apt-repo add
$(
tasknumber
"
$repo
"
)
sudocmd
_foreach
'apt-repo add'
$(
tasknumber
"
$repo
"
)
return
fi
...
...
@@ -118,7 +118,7 @@ local repo="$(eval echo "$quoted_args")"
case
$DISTRNAME
in
ALTLinux
)
__epm_addrepo_altlinux
$
repo
__epm_addrepo_altlinux
$
pkg_names
return
;;
esac
...
...
bin/epm-checksystem
View file @
8278dc03
...
...
@@ -40,6 +40,13 @@ epm_checksystem()
[
$EFFUID
=
"0"
]
&&
fatal
"Do not use checksystem under root"
case
$PMTYPE
in
homebrew
)
sudocmd brew doctor
return
;;
esac
case
$DISTRNAME
in
ALTLinux
)
epm_checksystem_
$DISTRNAME
...
...
bin/epm-clean
View file @
8278dc03
...
...
@@ -63,6 +63,9 @@ case $PMTYPE in
urpm-rpm
)
sudocmd urpmi
--clean
;;
homebrew
)
sudocmd brew cleanup
-s
;;
pacman
)
sudocmd pacman
-Sc
--noconfirm
;;
...
...
bin/epm-dedup
View file @
8278dc03
...
...
@@ -53,7 +53,7 @@ case "$DISTRNAME" in
"ALTLinux"
)
assure_exists /usr/share/apt/scripts apt-scripts
if
[
-f
/usr/share/apt/scripts/dedup.lua
]
;
then
"Check for duplicates via apt-get dedup from apt-scripts"
info
"Check for duplicates via apt-get dedup from apt-scripts"
sudocmd apt-get dedup
else
try_fix_apt_rpm_dupls
...
...
bin/epm-download
View file @
8278dc03
...
...
@@ -219,6 +219,9 @@ epm_download()
opkg
)
docmd opkg
$pkg_filenames
;;
homebrew
)
docmd brew fetch
$pkg_filenames
;;
*
)
fatal
"Have no suitable command for
$PMTYPE
"
;;
...
...
bin/epm-install
View file @
8278dc03
...
...
@@ -538,14 +538,12 @@ epm_print_install_names_command()
epm_install
()
{
if
tasknumber
"
$pkg_names
"
>
/dev/null
;
then
assure_distr ALTLinux
"install with task number"
assure_exists apt-repo
local
task
for
task
in
$(
tasknumber
"
$pkg_names
"
)
;
do
sudocmd apt-repo
test
$task
done
return
if
[
"
$DISTRNAME
"
=
"ALTLinux"
]
;
then
if
tasknumber
"
$pkg_names
"
>
/dev/null
;
then
assure_exists apt-repo
sudocmd_foreach
"apt-repo test"
"
$(
tasknumber
$pkg_names
)
"
return
fi
fi
if
[
-n
"
$show_command_only
"
]
;
then
...
...
bin/epm-query
View file @
8278dc03
...
...
@@ -231,10 +231,14 @@ __epm_query_name()
conary
)
CMD
=
"conary query"
;;
homebrew
)
docmd brew info
"
$1
"
>
/dev/null 2>/dev/null
&&
echo
"
$1
"
&&
return
return
1
;;
#homebrew)
# showcmd "brew info $1"
# local HBRESULT
# HBRESULT="$(brew info "$1" 2>/dev/null)" || return
# echo "$HBRESULT" | grep -q "Not installed" && return 1
# echo "$1"
# return 0
# ;;
pacman
)
docmd pacman
-Q
$@
return
...
...
bin/epm-query_file
View file @
8278dc03
...
...
@@ -41,7 +41,7 @@ __do_query_real_file()
if
[
-e
"
$1
"
]
;
then
TOFILE
=
"
$(
__abs_filename
"
$1
"
)
"
else
TOFILE
=
$(
which
"
$1
"
2>/dev/null
||
echo
"
$1
"
)
TOFILE
=
$(
which
--
"
$1
"
2>/dev/null
||
echo
"
$1
"
)
if
[
"
$TOFILE
"
!=
"
$1
"
]
;
then
info
"Note:
$1
is placed as
$TOFILE
"
fi
...
...
@@ -51,7 +51,7 @@ __do_query_real_file()
if
[
-L
"
$TOFILE
"
]
;
then
local
LINKTO
__do_query
"
$TOFILE
"
LINKTO
=
$(
readlink
-f
"
$TOFILE
"
)
LINKTO
=
$(
readlink
-f
--
"
$TOFILE
"
)
info
"Note:
$TOFILE
is link to
$LINKTO
"
__do_query_real_file
"
$LINKTO
"
return
...
...
bin/epm-reinstall
View file @
8278dc03
...
...
@@ -43,6 +43,9 @@ epm_reinstall_names()
dnf-rpm
)
sudocmd dnf reinstall
$@
return
;;
homebrew
)
sudocmd brew reinstall
$@
return
;;
pkgng
)
sudocmd pkg
install
-f
$@
return
;;
...
...
bin/epm-release_upgrade
View file @
8278dc03
...
...
@@ -133,6 +133,7 @@ get_fix_release_pkg()
[
"
$TOINSTALL
"
=
"altlinux-release-sisyphus"
]
&&
TOINSTALL
=
"branding-alt-sisyphus-release"
# update if installed (just print package name here to include in the install list)
epm
--quiet
--short
-q
alt-gpgkeys 2>/dev/null
epm
--quiet
--short
-q
etersoft-gpgkeys 2>/dev/null
if
[
-n
"
$TOINSTALL
"
]
;
then
...
...
bin/epm-remove
View file @
8278dc03
...
...
@@ -251,13 +251,12 @@ epm_remove()
return
fi
local
tn
=
$(
tasknumber
"
$pkg_names
"
)
if
[
-n
"
$tn
"
]
;
then
assure_distr ALTLinux
"remove with task number"
assure_exists apt-repo
pkg_names
=
$(
showcmd apt-repo list
$tn
)
#docmd epm remove $dryrun
return
if
[
"
$DISTRNAME
"
=
"ALTLinux"
]
;
then
load_helper epm-sh-altlinux
if
tasknumber
"
$pkg_names
"
>
/dev/null
;
then
assure_exists apt-repo
pkg_names
=
"
$(
get_task_packages
$pkg_names
)
"
fi
fi
# TODO: fix pkg_names override
...
...
bin/epm-removerepo
View file @
8278dc03
...
...
@@ -25,6 +25,7 @@ local repo="$(eval echo $quoted_args)"
case
$DISTRNAME
in
ALTLinux
)
assure_exists apt-repo
case
"
$repo
"
in
autoimports
)
info
"remove autoimports repo"
...
...
@@ -49,14 +50,24 @@ case $DISTRNAME in
;;
*
)
if
tasknumber
"
$repo
"
>
/dev/null
;
then
repo
=
"
$(
epm repolist |
grep
"repo/
$(
tasknumber
"
$repo
"
)
"
| line
)
"
# "
#sudocmd apt-repo rm all tasks
#return
local
tn
for
tn
in
$(
tasknumber
"
$repo
"
)
;
do
repoline
=
"
$(
epm repolist |
grep
" repo/
$tn
/"
| line
)
"
#"
[
-n
"
$repoline
"
]
||
{
info
"Can't find
$tn
task in the repository list"
;
continue
;
}
sudocmd apt-repo
rm
"
$repoline
"
# try again to remove possible x86_64-i586
repoline
=
"
$(
epm repolist |
grep
" repo/
$tn
/"
| line
)
"
#"
[
-n
"
$repoline
"
]
||
continue
sudocmd apt-repo
rm
"
$repoline
"
done
return
0
fi
;;
esac
[
-n
"
$repo
"
]
||
fatal
"No such repo or task. Use epm remove repo [autoimports|archive|tasks/TASKNUMBER]"
assure_exists apt-repo
sudocmd apt-repo
rm
"
$repo
"
return
;;
...
...
bin/epm-requires
View file @
8278dc03
...
...
@@ -103,6 +103,11 @@ case $PMTYPE in
assure_exists equery
CMD
=
"equery depgraph"
;;
homebrew
)
#docmd brew info $pkg_names | grep "^Required: " | sed -s "|s|^Requires: ||"
docmd brew deps
$pkg_names
return
;;
pkgng
)
#CMD="pkg rquery '%dn-%dv'"
CMD
=
"pkg info -d"
...
...
bin/epm-sh-altlinux
View file @
8278dc03
...
...
@@ -110,7 +110,7 @@ get_local_alt_contents_index()
epm_repolist |
grep
-E
"rpm.*(ftp://|http://|https://|file:/)"
|
sed
-e
"s@^rpm.*
\(
ftp://
\|
http://
\|
https://
\|
file:
\)
@
\1
@g"
|
while
read
-r
URL ARCH other
;
do
LOCALPATH
=
$(
get_local_alt_mirror_path
"
$URL
/
$ARCH
"
)
download_alt_contents_index
$URL
/
$ARCH
/base/contents_index
$LOCALPATH
>
&2
||
continue
download_alt_contents_index
$URL
/
$ARCH
/base/contents_index
$LOCALPATH
>
&2
</dev/null
||
continue
echo
"
$LOCALPATH
/contents_index*"
done
...
...
@@ -122,3 +122,11 @@ tasknumber()
isnumber
"
$num
"
&&
echo
"
$*
"
}
# use assure apt-repo before
get_task_packages
()
{
local
tn
for
tn
in
$(
tasknumber
"
$@
"
)
;
do
docmd apt-repo list task
"
$tn
"
done
}
bin/epm-sh-functions
View file @
8278dc03
...
...
@@ -229,7 +229,7 @@ clean_store_output()
epm
()
{
[
-n
"
$PROGNAME
"
]
||
fatal
"Can't use epm call from the piped script"
$PROGDIR
/
$PROGNAME
$@
$PROGDIR
/
$PROGNAME
--inscript
$@
}
# Print error message and stop the program
...
...
@@ -371,6 +371,7 @@ assure_exists()
# will replaced within disabled_eget in packaged version
eget
()
{
local
EGET
# use internal eget only if exists
if
[
-s
$SHAREDIR
/tools_eget
]
;
then
$SHAREDIR
/tools_eget
"
$@
"
...
...
@@ -463,8 +464,11 @@ set_pm_type()
{
local
CMD
#
Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR
#
use external distro_info if internal one is missed
DISTRVENDOR
=
$PROGDIR
/distr_info
[
-x
$DISTRVENDOR
]
||
DISTRVENDOR
=
distro_info
# Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR
[
-n
"
$DISTRNAME
"
]
||
DISTRNAME
=
$(
$DISTRVENDOR
-d
)
||
fatal
"Can't get distro name."
[
-n
"
$DISTRVERSION
"
]
||
DISTRVERSION
=
$(
$DISTRVENDOR
-v
)
set_target_pkg_env
...
...
@@ -554,16 +558,9 @@ esac
PMTYPE
=
$CMD
}
# https://unix.stackexchange.com/questions/196166/how-to-find-out-if-a-system-uses-sysv-upstart-or-systemd-initsystem
is_active_systemd
()
{
local
a
SYSTEMCTL
=
/bin/systemctl
#[ -x "$SYSTEMCTL" ] || return
[
-d
/run/systemd/system
]
||
return
#SYSTEMD_CGROUP_DIR=/sys/fs/cgroup/systemd
#[ -d "$SYSTEMD_CGROUP_DIR" ] || return
#cat /proc/1/comm | grep -q 'systemd' && return
[
"
$(
$DISTRVENDOR
-y
)
"
=
"systemd"
]
}
assure_distr
()
...
...
bin/epm-site
View file @
8278dc03
...
...
@@ -80,6 +80,10 @@ query_package_url()
#LANG=C epm info "$1"
return
;;
homebrew
)
docmd brew
"
$1
"
|
grep
"^From: "
|
sed
-e
"s|^From: ||"
return
;;
esac
fatal
"rpm based distro supported only. TODO: Realize via web service?"
}
...
...
bin/epm-upgrade
View file @
8278dc03
...
...
@@ -30,6 +30,25 @@ epm_upgrade()
update_repo_if_needed
warmup_bases
if
[
"
$DISTRNAME
"
=
"ALTLinux"
]
;
then
load_helper epm-sh-altlinux
if
tasknumber
"
$pkg_names
"
>
/dev/null
;
then
load_helper epm-addrepo
load_helper epm-removerepo
load_helper epm-Install
epm_addrepo
local
installlist
=
"
$(
get_task_packages
$pkg_names
)
"
[
-n
"
$verbose
"
]
&&
info
"Packages from task(s):
$installlist
"
# install only installed packages (simulate upgrade packages)
installlist
=
"
$(
estrlist exclude
"
$(
echo
"
$installlist
"
|
(
skip_installed
=
'yes'
filter_out_installed_packages
)
)"
"
$installlist
"
)
"
[
-n
"
$verbose
"
]
&&
info
"Packages to upgrade:
$installlist
"
(
pkg_names
=
"
$installlist
"
epm_Install
)
epm_removerepo
return
fi
fi
info
"Running command for upgrade packages"
case
$PMTYPE
in
...
...
@@ -113,4 +132,5 @@ epm_upgrade()
esac
sudocmd
$CMD
$pkg_filenames
}
bin/epm-whatdepends
View file @
8278dc03
...
...
@@ -61,6 +61,9 @@ case $PMTYPE in
assure_exists equery
CMD
=
"equery depends -a"
;;
homebrew
)
CMD
=
"brew uses"
;;
pkgng
)
CMD
=
"pkg info -r"
;;
...
...
bin/serv
View file @
8278dc03
...
...
@@ -48,9 +48,12 @@ set_service_type()
{
local
CMD
#
Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR
#
use external distro_info if internal one is missed
DISTRVENDOR
=
$PROGDIR
/distr_info
[
-n
"
$DISTRNAME
"
]
||
DISTRNAME
=
$(
$DISTRVENDOR
-d
)
||
fatal
"Can't get distro name."
[
-x
$DISTRVENDOR
]
||
DISTRVENDOR
=
distro_info
# Fill for use: PMTYPE, DISTRNAME, DISTRVERSION, PKGFORMAT, PKGVENDOR, RPMVENDOR
[
-n
"
$DISTRNAME
"
]
||
DISTRNAME
=
$(
$DISTRVENDOR
-d
)
||
fatal
"Can't get distro name from
$DISTRVENDOR
."
[
-n
"
$DISTRVERSION
"
]
||
DISTRVERSION
=
$(
$DISTRVENDOR
-v
)
set_target_pkg_env
...
...
@@ -127,19 +130,13 @@ $(get_help HELPOPT)
"
}
detect_virt
()
{
which systemd-detect-virt
>
/dev/null 2>/dev/null
||
return
a
=
systemd-detect-virt
}
print_version
()
{
local
on_text
=
"(host system)"
local
virt
=
"
$(
detect_virt
)
"
[
"
$virt
"
=
"
none"
]
||
[
"
$virt
"
=
"
"
]
||
on_text
=
"(under
$virt
)"
local
virt
=
"
$(
$DISTRVENDOR
-i
)
"
[
"
$virt
"
=
"
(unknown)"
]
||
[
"
$virt
"
=
"(host system)
"
]
||
on_text
=
"(under
$virt
)"
echo
"Service manager version @VERSION@"
echo
"Running on
$(
$DISTRVENDOR
)
$on_text
with
$SERVICETYPE
"
echo
"Running on
$(
$DISTRVENDOR
-e
)
$on_text
with
$SERVICETYPE
"
echo
"Copyright (c) Etersoft 2012-2019"
echo
"This program may be freely redistributed under the terms of the GNU AGPLv3."
}
...
...
@@ -213,6 +210,9 @@ check_command()
log|journal
)
# HELPCMD: print log for the service
serv_cmd
=
log
;;
edit
)
serv_cmd
=
edit
# HELPCMD: edit service file overload (use --full to edit full file)
;;
*
)
return
1
;;
...
...
bin/serv-edit
0 → 100644
View file @
8278dc03
#!/bin/sh
#
# Copyright (C) 2019 Etersoft
# Copyright (C) 2019 Vitaly Lipatov <lav@etersoft.ru>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
serv_edit
()
{
local
SERVICE
=
"
$1
"
shift
case
$SERVICETYPE
in
systemd
)
sudocmd systemctl edit
"
$@
"
"
$SERVICE
"
;;
*
)
fatal
"Have no suitable for
$DISTRNAME
command for
$SERVICETYPE
"
;;
esac
}
eepm.spec
View file @
8278dc03
# This spec is backported to ALTLinux p8 automatically by rpmbph script from etersoft-build-utils.
#
Name: eepm
Version: 3.1.
0
Version: 3.1.
2
Release: alt0.M80P.1
Summary: Etersoft EPM package manager
...
...
@@ -25,6 +25,7 @@ Provides: upm
%if %_vendor == "alt"
# FIXHERE: Replace with target platform package manager
Requires: apt rpm
Requires: distro_info >= 1.1
%endif
%description
...
...
@@ -70,6 +71,8 @@ chmod a+x %buildroot%_datadir/%name/tools_*
%if %_vendor == "alt"
# use external eget
rm -f %buildroot%_datadir/%name/tools_eget
# use external distro_info
rm -f %buildroot%_bindir/distr_info
%endif
%files
...
...
@@ -83,16 +86,34 @@ rm -f %buildroot%_datadir/%name/tools_eget
%_bindir/upm
%_bindir/serv
%_bindir/cerv
%if %_vendor != "alt"
%_bindir/distr_info
%endif
%_man1dir/*
%_datadir/%name/
%_sysconfdir/bash_completion.d/serv
%_sysconfdir/bash_completion.d/cerv
%changelog
*
Fri Nov 08 2019 Vitaly Lipatov <lav@altlinux.ru> 3.1.0
-alt0.M80P.1
*
Tue Nov 26 2019 Vitaly Lipatov <lav@altlinux.ru> 3.1.2
-alt0.M80P.1
- backport to ALTLinux p8 (by rpmbph script)
* Tue Nov 26 2019 Vitaly Lipatov <lav@altlinux.ru> 3.1.2-alt1
- improve homebrew support
- serv: add edit support for systemd
- fixes for ALT p9 detection
- epm query_file: use -- after options
- use external distro_info on non ALT systems
- epm: add support for a few tasks in addrepo/removerepo/install
- upgrade: add support for epm upgrade TASK (upgrade only already installed packages)
- remove TASK: remove all packages from the TASK
- release_upgrade: install alt-gpgkeys firstly
* Tue Nov 12 2019 Vitaly Lipatov <lav@altlinux.ru> 3.1.1-alt1
- epm-dedup: fix info message (ALT bug 37473)
- epm: add --no-stdin support (do not read commands from stdin)
- run internal eepm with --inscript (no read from stdin) (ALT bug 37209)
* Fri Nov 08 2019 Vitaly Lipatov <lav@altlinux.ru> 3.1.0-alt1
- add epm full-upgrade
- kernel update/remove: add --auto support (non interactive)
...
...
packed/epm.sh
View file @
8278dc03
This diff is collapsed.
Click to expand it.
packed/serv.sh
View file @
8278dc03
...
...
@@ -458,10 +458,12 @@ if [ -n "$FORCEPM" ] ; then
return
fi
case
$DISTRNAME
in
ALTLinux
)
CMD
=
"apt-rpm"
#which ds-install 2>/dev/null >/dev/null && CMD=deepsolver-rpm
#which pkcon 2>/dev/null >/dev/null && CMD=packagekit-rpm
;;
PCLinux
)
CMD
=
"apt-rpm"
...
...
@@ -531,19 +533,15 @@ esac
PMTYPE
=
$CMD
}
is_active_systemd
()
{
local
a
SYSTEMCTL
=
/bin/systemctl
SYSTEMD_CGROUP_DIR
=
/sys/fs/cgroup/systemd
[
-x
"
$SYSTEMCTL
"
]
||
return
[
-d
"
$SYSTEMD_CGROUP_DIR
"
]
||
return
a
=
''
mountpoint
-q
"
$SYSTEMD_CGROUP_DIR
"
||
return
readlink
/sbin/init |
grep
-q
'systemd'
||
return
# some hack
# shellcheck disable=SC2009
ps ax |
grep
'[s]ystemd'
|
grep
-q
-v
'systemd-udev'
#[ -x "$SYSTEMCTL" ] || return
[
-d
/run/systemd/system
]
||
return
#SYSTEMD_CGROUP_DIR=/sys/fs/cgroup/systemd
#[ -d "$SYSTEMD_CGROUP_DIR" ] || return
#cat /proc/1/comm | grep -q 'systemd' && return
}
assure_distr
()
...
...
@@ -742,6 +740,9 @@ __serv_log_altlinux()
postfix
)
sudocmd
tail
-f
/var/log/mail/all /var/log/mail/errors
;;
sshd
)
sudocmd
tail
-f
/var/log/auth/all
;;
cups
)
sudocmd
tail
-f
/var/log/cups/access_log /var/log/cups/error_log
;;
...
...
@@ -1168,15 +1169,19 @@ fi
# ALT Linux based
if
distro altlinux-release
;
then
# TODO: use os-release firsly
DISTRIB_ID
=
"ALTLinux"
if
has Sisyphus
;
then
DISTRIB_RELEASE
=
"Sisyphus"
elif
has
"ALT Linux 7."
;
then
DISTRIB_RELEASE
=
"p7"
elif
has
"ALT Linux t7."
;
then
DISTRIB_RELEASE
=
"t7"
elif
has
"ALT Linux 8."
;
then
DISTRIB_RELEASE
=
"p8"
elif
has
"ALT .*8.[0-9]"
;
then
DISTRIB_RELEASE
=
"p8"
elif
has
"ALT .*9.[0-9]"
;
then
DISTRIB_RELEASE
=
"p9"
elif
has
"ALT p9 p9"
;
then
DISTRIB_RELEASE
=
"p9"
elif
has
"Simply Linux 6."
;
then
DISTRIB_RELEASE
=
"p6"
elif
has
"Simply Linux 7."
;
then
DISTRIB_RELEASE
=
"p7"
elif
has
"Simply Linux 8."
;
then
DISTRIB_RELEASE
=
"p8"
elif
has
"Simply Linux 9."
;
then
DISTRIB_RELEASE
=
"p9"
elif
has
"ALT Linux 6."
;
then
DISTRIB_RELEASE
=
"p6"
elif
has
"ALT Linux p8"
;
then
DISTRIB_RELEASE
=
"p8"
elif
has
"ALT Linux p7"
;
then
DISTRIB_RELEASE
=
"p7"
...
...
@@ -2238,11 +2243,20 @@ $(get_help HELPOPT)
"
}
detect_virt
()
{
which systemd-detect-virt
>
/dev/null 2>/dev/null
||
return
a
=
systemd-detect-virt
}
print_version
()
{
echo
"Service manager version 2.5.8"
echo
"Running on
$(
$DISTRVENDOR
)
with
$SERVICETYPE
"
echo
"Copyright (c) Etersoft 2012-2018"
local
on_text
=
"(host system)"
local
virt
=
"
$(
detect_virt
)
"
[
"
$virt
"
=
"none"
]
||
[
"
$virt
"
=
""
]
||
on_text
=
"(under
$virt
)"
echo
"Service manager version 3.1.0"
echo
"Running on
$(
$DISTRVENDOR
)
$on_text
with
$SERVICETYPE
"
echo
"Copyright (c) Etersoft 2012-2019"
echo
"This program may be freely redistributed under the terms of the GNU AGPLv3."
}
...
...
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