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
ae011efe
Commit
ae011efe
authored
Aug 19, 2022
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Revert "fix docmd using (remove extra quotes)""
This reverts commit
c8ae7cbd
.
parent
a751f52d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
24 deletions
+24
-24
epm-release_upgrade
bin/epm-release_upgrade
+23
-23
epm-search_file
bin/epm-search_file
+1
-1
No files found.
bin/epm-release_upgrade
View file @
ae011efe
...
@@ -279,9 +279,9 @@ __switch_alt_to_distro()
...
@@ -279,9 +279,9 @@ __switch_alt_to_distro()
case
"
$*
"
in
case
"
$*
"
in
"p6"
|
"p6 p7"
|
"t6 p7"
|
"c6 c7"
)
"p6"
|
"p6 p7"
|
"t6 p7"
|
"c6 c7"
)
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
||
fatal
docmd epm
install
rpm apt
$(
get_fix_release_pkg
"
$FROM
"
)
||
fatal
__switch_repo_to
$TO
__switch_repo_to
$TO
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
install
rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
__do_upgrade
__do_upgrade
end_change_alt_repo
end_change_alt_repo
docmd epm update-kernel
docmd epm update-kernel
...
@@ -289,9 +289,9 @@ __switch_alt_to_distro()
...
@@ -289,9 +289,9 @@ __switch_alt_to_distro()
;;
;;
"p7"
|
"p7 p8"
|
"t7 p8"
|
"c7 c8"
)
"p7"
|
"p7 p8"
|
"t7 p8"
|
"c7 c8"
)
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
||
fatal
docmd epm
install
rpm apt
$(
get_fix_release_pkg
"
$FROM
"
)
||
fatal
__switch_repo_to
$TO
__switch_repo_to
$TO
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
install
rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
__do_upgrade
__do_upgrade
end_change_alt_repo
end_change_alt_repo
__check_system
"
$TO
"
__check_system
"
$TO
"
...
@@ -300,9 +300,9 @@ __switch_alt_to_distro()
...
@@ -300,9 +300,9 @@ __switch_alt_to_distro()
;;
;;
"c8"
|
"c8.1"
|
"c8.2"
|
"c8 c8.1"
|
"c8.1 c8.2"
|
"c8 c8.2"
)
"c8"
|
"c8.1"
|
"c8.2"
|
"c8 c8.1"
|
"c8.1 c8.2"
|
"c8 c8.2"
)
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
||
fatal
docmd epm
install
rpm apt
$(
get_fix_release_pkg
"
$FROM
"
)
||
fatal
__switch_repo_to
$TO
__switch_repo_to
$TO
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
install
rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
__do_upgrade
__do_upgrade
end_change_alt_repo
end_change_alt_repo
__check_system
"
$TO
"
__check_system
"
$TO
"
...
@@ -310,9 +310,9 @@ __switch_alt_to_distro()
...
@@ -310,9 +310,9 @@ __switch_alt_to_distro()
;;
;;
"p8 c8"
|
"p8 c8.1"
|
"p8 c8.2"
)
"p8 c8"
|
"p8 c8.1"
|
"p8 c8.2"
)
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
||
fatal
docmd epm
install
rpm apt
$(
get_fix_release_pkg
"
$FROM
"
)
||
fatal
__switch_repo_to
$TO
__switch_repo_to
$TO
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
install
rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
if
epm installed libcrypt
;
then
if
epm installed libcrypt
;
then
# glibc-core coflicts libcrypt
# glibc-core coflicts libcrypt
docmd epm downgrade apt pam pam0_passwdqc glibc-core libcrypt-
||
fatal
docmd epm downgrade apt pam pam0_passwdqc glibc-core libcrypt-
||
fatal
...
@@ -325,7 +325,7 @@ __switch_alt_to_distro()
...
@@ -325,7 +325,7 @@ __switch_alt_to_distro()
;;
;;
"p8"
|
"p8 p9"
|
"t8 p9"
|
"c8 c9"
|
"c8 p9"
|
"c8.1 p9"
|
"c8.2 p9"
|
"p9 p9"
|
"p9 c9f2"
)
"p8"
|
"p8 p9"
|
"t8 p9"
|
"c8 c9"
|
"c8 p9"
|
"c8.1 p9"
|
"c8.2 p9"
|
"p9 p9"
|
"p9 c9f2"
)
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
||
fatal
docmd epm
install
rpm apt
$(
get_fix_release_pkg
"
$FROM
"
)
||
fatal
info
"Workaround for https://bugzilla.altlinux.org/show_bug.cgi?id=35492 ..."
info
"Workaround for https://bugzilla.altlinux.org/show_bug.cgi?id=35492 ..."
if
epm installed gdb
>
/dev/null
;
then
if
epm installed gdb
>
/dev/null
;
then
docmd epm remove gdb
||
fatal
docmd epm remove gdb
||
fatal
...
@@ -333,7 +333,7 @@ __switch_alt_to_distro()
...
@@ -333,7 +333,7 @@ __switch_alt_to_distro()
__switch_repo_to
$TO
__switch_repo_to
$TO
__do_upgrade
__do_upgrade
end_change_alt_repo
end_change_alt_repo
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
install
rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
__check_system
"
$TO
"
__check_system
"
$TO
"
docmd epm update-kernel
||
fatal
docmd epm update-kernel
||
fatal
info
"Run epm release-upgrade again for update to p10"
info
"Run epm release-upgrade again for update to p10"
...
@@ -342,19 +342,19 @@ __switch_alt_to_distro()
...
@@ -342,19 +342,19 @@ __switch_alt_to_distro()
info
"Upgrade all packages to current
$FROM
repository"
info
"Upgrade all packages to current
$FROM
repository"
__do_upgrade
__do_upgrade
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
||
fatal
docmd epm
install
rpm apt
$(
get_fix_release_pkg
"
$FROM
"
)
||
fatal
__switch_repo_to
$TO
__switch_repo_to
$TO
__do_upgrade
__do_upgrade
end_change_alt_repo
end_change_alt_repo
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
install
rpm apt
$(
get_fix_release_pkg
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
__check_system
"
$TO
"
__check_system
"
$TO
"
docmd epm update-kernel
-t
std-def
||
fatal
docmd epm update-kernel
-t
std-def
||
fatal
;;
;;
"p9 p8"
|
"c8.1 c8"
|
"c8.1 p8"
|
"p8 p8"
)
"p9 p8"
|
"c8.1 c8"
|
"c8.1 p8"
|
"p8 p8"
)
confirm_info
"Downgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Downgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
docmd epm
install
$(
get_fix_release_pkg
"
$FROM
"
)
__switch_repo_to
$TO
__switch_repo_to
$TO
docmd epm downgrade rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm downgrade rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
if
epm installed libcrypt
>
/dev/null
;
then
if
epm installed libcrypt
>
/dev/null
;
then
# glibc-core coflicts libcrypt
# glibc-core coflicts libcrypt
docmd epm downgrade apt rpm pam pam0_passwdqc glibc-core libcrypt-
||
fatal
docmd epm downgrade apt rpm pam pam0_passwdqc glibc-core libcrypt-
||
fatal
...
@@ -366,9 +366,9 @@ __switch_alt_to_distro()
...
@@ -366,9 +366,9 @@ __switch_alt_to_distro()
;;
;;
"p9 c8"
|
"p9 c8.1"
|
"p9 c8.2"
)
"p9 c8"
|
"p9 c8.1"
|
"p9 c8.2"
)
confirm_info
"Downgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Downgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
docmd epm
install
$(
get_fix_release_pkg
"
$FROM
"
)
__switch_repo_to
$TO
__switch_repo_to
$TO
docmd epm downgrade rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm downgrade rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
#if epm installed libcrypt >/dev/null ; then
#if epm installed libcrypt >/dev/null ; then
# # glibc-core coflicts libcrypt
# # glibc-core coflicts libcrypt
# docmd epm downgrade apt rpm pam pam0_passwdqc glibc-core libcrypt- || fatal
# docmd epm downgrade apt rpm pam pam0_passwdqc glibc-core libcrypt- || fatal
...
@@ -380,9 +380,9 @@ __switch_alt_to_distro()
...
@@ -380,9 +380,9 @@ __switch_alt_to_distro()
;;
;;
"p10 p9"
)
"p10 p9"
)
confirm_info
"Downgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Downgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
docmd epm
install
$(
get_fix_release_pkg
"
$FROM
"
)
__switch_repo_to
$TO
__switch_repo_to
$TO
docmd epm downgrade rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm downgrade rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
$force_yes
$non_interactive
downgrade
||
fatal
"Check the error and run '# epm downgrade'"
docmd epm
$force_yes
$non_interactive
downgrade
||
fatal
"Check the error and run '# epm downgrade'"
end_change_alt_repo
end_change_alt_repo
__check_system
"
$TO
"
__check_system
"
$TO
"
...
@@ -390,9 +390,9 @@ __switch_alt_to_distro()
...
@@ -390,9 +390,9 @@ __switch_alt_to_distro()
;;
;;
"Sisyphus p8"
|
"Sisyphus p9"
|
"Sisyphus p10"
|
"Sisyphus c8"
|
"Sisyphus c8.1"
|
"Sisyphus c9f2"
)
"Sisyphus p8"
|
"Sisyphus p9"
|
"Sisyphus p10"
|
"Sisyphus c8"
|
"Sisyphus c8.1"
|
"Sisyphus c9f2"
)
confirm_info
"Downgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Downgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
docmd epm
install
$(
get_fix_release_pkg
"
$FROM
"
)
__switch_repo_to
$TO
__switch_repo_to
$TO
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
install
rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
$force_yes
$non_interactive
downgrade
||
fatal
"Check the error and run '# epm downgrade'"
docmd epm
$force_yes
$non_interactive
downgrade
||
fatal
"Check the error and run '# epm downgrade'"
end_change_alt_repo
end_change_alt_repo
__check_system
"
$TO
"
__check_system
"
$TO
"
...
@@ -400,17 +400,17 @@ __switch_alt_to_distro()
...
@@ -400,17 +400,17 @@ __switch_alt_to_distro()
;;
;;
"p8 Sisyphus"
|
"p9 Sisyphus"
|
"p10 Sisyphus"
|
"10 Sisyphus"
|
"Sisyphus Sisyphus"
)
"p8 Sisyphus"
|
"p9 Sisyphus"
|
"p10 Sisyphus"
|
"10 Sisyphus"
|
"Sisyphus Sisyphus"
)
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
confirm_info
"Upgrade
$DISTRNAME
from
$FROM
to
$TO
..."
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
"
$FROM
"
)
"
||
fatal
docmd epm
install
rpm apt
$(
get_fix_release_pkg
"
$FROM
"
)
||
fatal
docmd epm upgrade
||
fatal
docmd epm upgrade
||
fatal
# TODO: epm_reposwitch??
# TODO: epm_reposwitch??
__replace_alt_version_in_repo
"
$FROM
/branch/"
"
$TO
/"
__replace_alt_version_in_repo
"
$FROM
/branch/"
"
$TO
/"
__alt_repofix
"alt"
__alt_repofix
"alt"
[
-s
/etc/rpm/macros.d/p10
]
&&
rm
-fv
/etc/rpm/macros.d/p10
[
-s
/etc/rpm/macros.d/p10
]
&&
rm
-fv
/etc/rpm/macros.d/p10
__epm_ru_update
||
fatal
__epm_ru_update
||
fatal
docmd epm
install
rpm apt
"
$(
get_fix_release_pkg
--force
"
$TO
"
)
"
||
fatal
"Check the errors and run '# epm release-upgrade' again"
docmd epm
install
rpm apt
$(
get_fix_release_pkg
--force
"
$TO
"
)
||
fatal
"Check the errors and run '# epm release-upgrade' again"
#local ADDPKG
#local ADDPKG
#ADDPKG=$(epm -q --short make-initrd sssd-ad 2>/dev/null)
#ADDPKG=$(epm -q --short make-initrd sssd-ad 2>/dev/null)
#docmd epm install librpm7 librpm rpm apt $ADDPKG
"$(get_fix_release_pkg --force "$TO")"
ConsoleKit2- || fatal "Check an error and run again"
#docmd epm install librpm7 librpm rpm apt $ADDPKG
$(get_fix_release_pkg --force "$TO")
ConsoleKit2- || fatal "Check an error and run again"
docmd epm
$force_yes
$non_interactive
upgrade
||
fatal
"Check the error and run '# epm release-upgrade' again or just '# epm upgrade'"
docmd epm
$force_yes
$non_interactive
upgrade
||
fatal
"Check the error and run '# epm release-upgrade' again or just '# epm upgrade'"
docmd epm
$force_yes
$non_interactive
downgrade
||
fatal
"Check the error and run '# epm downgrade'"
docmd epm
$force_yes
$non_interactive
downgrade
||
fatal
"Check the error and run '# epm downgrade'"
end_change_alt_repo
end_change_alt_repo
...
...
bin/epm-search_file
View file @
ae011efe
...
@@ -90,7 +90,7 @@ case $PMTYPE in
...
@@ -90,7 +90,7 @@ case $PMTYPE in
CMD
=
"xbps-query -Ro"
CMD
=
"xbps-query -Ro"
;;
;;
aptcyg
)
aptcyg
)
docmd apt-cyg searchall
"
$(
echo
"
$pkg_filenames
"
|
sed
-e
"s| /| |g"
)
"
docmd apt-cyg searchall
$(
echo
"
$pkg_filenames
"
|
sed
-e
"s| /| |g"
)
return
return
;;
;;
*
)
*
)
...
...
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