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
18dace21
Commit
18dace21
authored
Mar 08, 2020
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix filling of qouted_args, run helpers with full args, drop obsoleted related code
parent
cebcff95
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
38 deletions
+16
-38
epm
bin/epm
+5
-5
epm-addrepo
bin/epm-addrepo
+1
-1
epm-assure
bin/epm-assure
+1
-11
epm-print
bin/epm-print
+1
-12
epm-removerepo
bin/epm-removerepo
+7
-8
epm-sh-functions
bin/epm-sh-functions
+1
-1
No files found.
bin/epm
View file @
18dace21
...
...
@@ -410,11 +410,11 @@ FLAGENDOPTS=
for
opt
in
"
$@
"
;
do
[
"
$opt
"
=
"--"
]
&&
FLAGENDOPTS
=
1
&&
continue
if
[
-z
"
$FLAGENDOPTS
"
]
;
then
check_command
$opt
&&
continue
check_option
$opt
&&
continue
check_command
"
$opt
"
&&
continue
check_option
"
$opt
"
&&
continue
fi
# Note: will parse all params separately (no package names with spaces!)
check_filenames
$opt
check_filenames
"
$opt
"
done
# if input is not console and run script from file, get pkgs from stdin too
...
...
@@ -457,7 +457,7 @@ case $epm_cmd in
;;
esac
# Run helper for command
# Run helper for command
with natural args
load_helper epm-
$epm_cmd
e
pm_
$epm_cmd
e
val
epm_
$epm_cmd
$quoted_args
# return last error code (from subroutine)
bin/epm-addrepo
View file @
18dace21
...
...
@@ -114,7 +114,7 @@ __epm_addrepo_altlinux()
epm_addrepo
()
{
local
repo
=
"
$
(
eval echo
"
$quoted_args
"
)
"
local
repo
=
"
$
*
"
case
$DISTRNAME
in
ALTLinux
)
...
...
bin/epm-assure
View file @
18dace21
...
...
@@ -96,7 +96,7 @@ __epm_assure_checking()
# $2 - [package name]
# $3 - [needed package version]
__
epm_assure
()
epm_assure
()
{
local
CMD
=
"
$1
"
local
PACKAGE
=
"
$2
"
...
...
@@ -115,13 +115,3 @@ __epm_assure()
__epm_need_update
$PACKAGE
$PACKAGEVERSION
&&
return
1
return
0
}
epm_assure
()
{
[
-n
"
$pkg_filenames
"
]
||
fatal
"Assure: Missing params. Check
$0
--help for info."
# use helper func for extract separate params
# shellcheck disable=SC2046
__epm_assure
$(
eval echo
$quoted_args
)
}
bin/epm-print
View file @
18dace21
...
...
@@ -124,7 +124,7 @@ compare_version()
rpmevrcmp
"
$@
"
}
__
epm_print
()
epm_print
()
{
local
WHAT
=
"
$1
"
shift
...
...
@@ -255,14 +255,3 @@ EOF
;;
esac
}
epm_print
()
{
[
-n
"
$pkg_filenames
"
]
||
fatal
"Missed args. Use epm print help for get help."
# Note! do not quote args below (see eterbug #11863)
# shellcheck disable=SC2046
__epm_print
$(
eval echo
$quoted_args
)
}
bin/epm-removerepo
View file @
18dace21
...
...
@@ -71,11 +71,10 @@ __epm_removerepo_alt()
epm_removerepo
()
{
local
repo
=
"
$(
eval echo
$quoted_args
)
"
case
$DISTRNAME
in
ALTLinux
)
__epm_removerepo_alt
$repo
__epm_removerepo_alt
"
$@
"
return
;;
esac
;
...
...
@@ -83,7 +82,7 @@ esac;
case
$PMTYPE
in
apt-dpkg
)
assure_exists apt-add-repository software-properties-common
sudocmd apt-add-repository
--remove
"
$
repo
"
sudocmd apt-add-repository
--remove
"
$
@
"
info
"Check file /etc/apt/sources.list if needed"
;;
aptitude-dpkg
)
...
...
@@ -91,22 +90,22 @@ case $PMTYPE in
;;
yum-rpm
)
assure_exists yum-utils
sudocmd yum-config-manager
--disable
"
$
repo
"
sudocmd yum-config-manager
--disable
"
$
@
"
;;
urpm-rpm
)
sudocmd urpmi.removemedia
"
$
repo
"
sudocmd urpmi.removemedia
"
$
@
"
;;
zypper-rpm
)
sudocmd zypper removerepo
"
$
repo
"
sudocmd zypper removerepo
"
$
@
"
;;
emerge
)
sudocmd layman
"-d
$
repo
"
sudocmd layman
"-d
$
@
"
;;
pacman
)
info
"You need remove repo from /etc/pacman.conf"
;;
npackd
)
sudocmd npackdcl remove-repo
--url
=
"
$
repo
"
sudocmd npackdcl remove-repo
--url
=
"
$
@
"
;;
slackpkg
)
info
"You need remove repo from /etc/slackpkg/mirrors"
...
...
bin/epm-sh-functions
View file @
18dace21
...
...
@@ -365,7 +365,7 @@ assure_exists()
local
textpackage
=
[
-n
"
$package
"
]
||
package
=
"
$(
__get_package_for_command
"
$1
"
)
"
[
-n
"
$3
"
]
&&
textpackage
=
" >=
$3
"
__
epm_assure
"
$1
"
$package
$3
||
fatal
"Can't assure in '
$1
' command from
$package$textpackage
package"
epm_assure
"
$1
"
$package
$3
||
fatal
"Can't assure in '
$1
' command from
$package$textpackage
package"
}
# will replaced within disabled_eget in packaged version
...
...
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