Skip to content

E
eepm
Commit c1184208 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

commit packed 3.27.5

parent 21c2db35
Show whitespace changes
Inline Side-by-side
Showing with 44 additions and 22 deletions
packed/epm.sh
View file @ c1184208
...@@ -5797,7 +5797,7 @@ __switch_alt_to_distro() ...@@ -5797,7 +5797,7 @@ __switch_alt_to_distro()
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"
;; ;;
"p9"|"p9 p10"|"p10 p10") "p9"|"p9 p10"|"p10 p10"|"9 10"|"9 p10")
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 ..."
...@@ -9699,6 +9699,8 @@ fill_distr_info() ...@@ -9699,6 +9699,8 @@ fill_distr_info()
PRETTY_NAME="" PRETTY_NAME=""
DISTRIB_ID="" DISTRIB_ID=""
DISTRIB_RELEASE="" DISTRIB_RELEASE=""
DISTRIB_FULL_RELEASE=""
DISTRIB_RELEASE_ORIG=""
DISTRIB_CODENAME="" DISTRIB_CODENAME=""
# Default detection by /etc/os-release # Default detection by /etc/os-release
...@@ -9713,13 +9715,14 @@ if distro os-release ; then ...@@ -9713,13 +9715,14 @@ if distro os-release ; then
# set by os-release: # set by os-release:
#PRETTY_NAME #PRETTY_NAME
VENDOR_ID="$ID" VENDOR_ID="$ID"
DISTRIB_FULL_RELEASE=$DISTRIB_RELEASE DISTRIB_FULL_RELEASE="$DISTRIB_RELEASE"
DISTRIB_CODENAME="$VERSION_CODENAME" DISTRIB_CODENAME="$VERSION_CODENAME"
elif distro lsb-release ; then elif distro lsb-release ; then
DISTRIB_ID=$(cat $DISTROFILE | get_var DISTRIB_ID) DISTRIB_ID=$(cat $DISTROFILE | get_var DISTRIB_ID)
DISTRIB_RELEASE=$(cat $DISTROFILE | get_var DISTRIB_RELEASE) DISTRIB_RELEASE="$(cat $DISTROFILE | get_var DISTRIB_RELEASE)"
DISTRIB_RELEASE_ORIG="$DISTRIB_RELEASE" DISTRIB_RELEASE_ORIG="$DISTRIB_RELEASE"
DISTRIB_FULL_RELEASE="$DISTRIB_RELEASE"
DISTRIB_CODENAME=$(cat $DISTROFILE | get_var DISTRIB_CODENAME) DISTRIB_CODENAME=$(cat $DISTROFILE | get_var DISTRIB_CODENAME)
PRETTY_NAME=$(cat $DISTROFILE | get_var DISTRIB_DESCRIPTION) PRETTY_NAME=$(cat $DISTROFILE | get_var DISTRIB_DESCRIPTION)
fi fi
...@@ -9740,10 +9743,13 @@ case "$VENDOR_ID" in ...@@ -9740,10 +9743,13 @@ case "$VENDOR_ID" in
esac esac
;; ;;
"astra") "astra")
DISTRIB_RELEASE=$(normalize_version3 "$DISTRIB_RELEASE_ORIG" | sed -e 's|_.*||') DISTRIB_RELEASE=$(normalize_version2 "$DISTRIB_RELEASE_ORIG" | sed -e 's|_.*||')
[ "$VARIANT" = "orel" ] && DISTRIB_ID="AstraLinuxCE" || DISTRIB_ID="AstraLinuxSE" DISTRIB_FULL_RELEASE=$(normalize_version3 "$DISTRIB_RELEASE_ORIG" | sed -e 's|_.*||')
#[ "$DISTRIB_RELEASE" = "1.17" ] && DISTRIB_RELEASE="$VERSION_ID" if [ "$VARIANT" = "orel" ] || [ "$VARIANT" = "Orel" ] ; then
#DISTRIB_RELEASE="$VERSION_CODENAME" DISTRIB_ID="AstraLinuxCE"
else
DISTRIB_ID="AstraLinuxSE"
fi
;; ;;
esac esac
...@@ -9760,7 +9766,7 @@ case "$DISTRIB_ID" in ...@@ -9760,7 +9766,7 @@ case "$DISTRIB_ID" in
# ;; # ;;
"ALTSPWorkstation") "ALTSPWorkstation")
DISTRIB_ID="ALTLinux" DISTRIB_ID="ALTLinux"
case "$DISTRIB_FULL_RELEASE" in case "$DISTRIB_RELEASE_ORIG" in
8.0|8.1) 8.0|8.1)
;; ;;
8.2|8.3) 8.2|8.3)
...@@ -10226,7 +10232,8 @@ case "$1" in ...@@ -10226,7 +10232,8 @@ case "$1" in
echo " -s|-n - print base name of the distro (vendor name) (ubuntu for all Ubuntu family, alt for all ALT family) (see _vendor macros in rpm)" echo " -s|-n - print base name of the distro (vendor name) (ubuntu for all Ubuntu family, alt for all ALT family) (see _vendor macros in rpm)"
echo " -y - print running service manager" echo " -y - print running service manager"
echo " --pretty - print pretty distro name" echo " --pretty - print pretty distro name"
echo " -v - print version of distro" echo " -v - print version of the distro"
echo " --full-version - print full version of the distro"
echo " -V - print the utility version" echo " -V - print the utility version"
echo "Run without args to print all information." echo "Run without args to print all information."
exit 0 exit 0
...@@ -10288,7 +10295,11 @@ case "$1" in ...@@ -10288,7 +10295,11 @@ case "$1" in
;; ;;
-v) -v)
override_distrib "$2" override_distrib "$2"
echo $DISTRIB_RELEASE echo "$DISTRIB_RELEASE"
;;
--full-version)
override_distrib "$2"
echo "$DISTRIB_FULL_RELEASE"
;; ;;
-s|-n) -s|-n)
override_distrib "$2" override_distrib "$2"
...@@ -11332,7 +11343,7 @@ Examples: ...@@ -11332,7 +11343,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.27.4 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.27.5 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)" echo "Running on $($DISTRVENDOR -e) ('$PMTYPE' package manager uses '$PKGFORMAT' package format)"
echo "Copyright (c) Etersoft 2012-2022" echo "Copyright (c) Etersoft 2012-2022"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
...@@ -11342,7 +11353,7 @@ print_version() ...@@ -11342,7 +11353,7 @@ print_version()
Usage="Usage: epm [options] <command> [package name(s), package files]..." Usage="Usage: epm [options] <command> [package name(s), package files]..."
Descr="epm - EPM package manager" Descr="epm - EPM package manager"
EPMVERSION=3.27.4 EPMVERSION=3.27.5
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
......
packed/serv.sh
View file @ c1184208
...@@ -1605,6 +1605,8 @@ fill_distr_info() ...@@ -1605,6 +1605,8 @@ fill_distr_info()
PRETTY_NAME="" PRETTY_NAME=""
DISTRIB_ID="" DISTRIB_ID=""
DISTRIB_RELEASE="" DISTRIB_RELEASE=""
DISTRIB_FULL_RELEASE=""
DISTRIB_RELEASE_ORIG=""
DISTRIB_CODENAME="" DISTRIB_CODENAME=""
# Default detection by /etc/os-release # Default detection by /etc/os-release
...@@ -1619,13 +1621,14 @@ if distro os-release ; then ...@@ -1619,13 +1621,14 @@ if distro os-release ; then
# set by os-release: # set by os-release:
#PRETTY_NAME #PRETTY_NAME
VENDOR_ID="$ID" VENDOR_ID="$ID"
DISTRIB_FULL_RELEASE=$DISTRIB_RELEASE DISTRIB_FULL_RELEASE="$DISTRIB_RELEASE"
DISTRIB_CODENAME="$VERSION_CODENAME" DISTRIB_CODENAME="$VERSION_CODENAME"
elif distro lsb-release ; then elif distro lsb-release ; then
DISTRIB_ID=$(cat $DISTROFILE | get_var DISTRIB_ID) DISTRIB_ID=$(cat $DISTROFILE | get_var DISTRIB_ID)
DISTRIB_RELEASE=$(cat $DISTROFILE | get_var DISTRIB_RELEASE) DISTRIB_RELEASE="$(cat $DISTROFILE | get_var DISTRIB_RELEASE)"
DISTRIB_RELEASE_ORIG="$DISTRIB_RELEASE" DISTRIB_RELEASE_ORIG="$DISTRIB_RELEASE"
DISTRIB_FULL_RELEASE="$DISTRIB_RELEASE"
DISTRIB_CODENAME=$(cat $DISTROFILE | get_var DISTRIB_CODENAME) DISTRIB_CODENAME=$(cat $DISTROFILE | get_var DISTRIB_CODENAME)
PRETTY_NAME=$(cat $DISTROFILE | get_var DISTRIB_DESCRIPTION) PRETTY_NAME=$(cat $DISTROFILE | get_var DISTRIB_DESCRIPTION)
fi fi
...@@ -1646,10 +1649,13 @@ case "$VENDOR_ID" in ...@@ -1646,10 +1649,13 @@ case "$VENDOR_ID" in
esac esac
;; ;;
"astra") "astra")
DISTRIB_RELEASE=$(normalize_version3 "$DISTRIB_RELEASE_ORIG" | sed -e 's|_.*||') DISTRIB_RELEASE=$(normalize_version2 "$DISTRIB_RELEASE_ORIG" | sed -e 's|_.*||')
[ "$VARIANT" = "orel" ] && DISTRIB_ID="AstraLinuxCE" || DISTRIB_ID="AstraLinuxSE" DISTRIB_FULL_RELEASE=$(normalize_version3 "$DISTRIB_RELEASE_ORIG" | sed -e 's|_.*||')
#[ "$DISTRIB_RELEASE" = "1.17" ] && DISTRIB_RELEASE="$VERSION_ID" if [ "$VARIANT" = "orel" ] || [ "$VARIANT" = "Orel" ] ; then
#DISTRIB_RELEASE="$VERSION_CODENAME" DISTRIB_ID="AstraLinuxCE"
else
DISTRIB_ID="AstraLinuxSE"
fi
;; ;;
esac esac
...@@ -1666,7 +1672,7 @@ case "$DISTRIB_ID" in ...@@ -1666,7 +1672,7 @@ case "$DISTRIB_ID" in
# ;; # ;;
"ALTSPWorkstation") "ALTSPWorkstation")
DISTRIB_ID="ALTLinux" DISTRIB_ID="ALTLinux"
case "$DISTRIB_FULL_RELEASE" in case "$DISTRIB_RELEASE_ORIG" in
8.0|8.1) 8.0|8.1)
;; ;;
8.2|8.3) 8.2|8.3)
...@@ -2132,7 +2138,8 @@ case "$1" in ...@@ -2132,7 +2138,8 @@ case "$1" in
echo " -s|-n - print base name of the distro (vendor name) (ubuntu for all Ubuntu family, alt for all ALT family) (see _vendor macros in rpm)" echo " -s|-n - print base name of the distro (vendor name) (ubuntu for all Ubuntu family, alt for all ALT family) (see _vendor macros in rpm)"
echo " -y - print running service manager" echo " -y - print running service manager"
echo " --pretty - print pretty distro name" echo " --pretty - print pretty distro name"
echo " -v - print version of distro" echo " -v - print version of the distro"
echo " --full-version - print full version of the distro"
echo " -V - print the utility version" echo " -V - print the utility version"
echo "Run without args to print all information." echo "Run without args to print all information."
exit 0 exit 0
...@@ -2194,7 +2201,11 @@ case "$1" in ...@@ -2194,7 +2201,11 @@ case "$1" in
;; ;;
-v) -v)
override_distrib "$2" override_distrib "$2"
echo $DISTRIB_RELEASE echo "$DISTRIB_RELEASE"
;;
--full-version)
override_distrib "$2"
echo "$DISTRIB_FULL_RELEASE"
;; ;;
-s|-n) -s|-n)
override_distrib "$2" override_distrib "$2"
...@@ -2327,7 +2338,7 @@ print_version() ...@@ -2327,7 +2338,7 @@ print_version()
local on_text="(host system)" local on_text="(host system)"
local virt="$($DISTRVENDOR -i)" local virt="$($DISTRVENDOR -i)"
[ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)" [ "$virt" = "(unknown)" ] || [ "$virt" = "(host system)" ] || on_text="(under $virt)"
echo "Service manager version 3.27.4 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.27.5 https://wiki.etersoft.ru/Epm"
echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE" echo "Running on $($DISTRVENDOR -e) $on_text with $SERVICETYPE"
echo "Copyright (c) Etersoft 2012-2021" echo "Copyright (c) Etersoft 2012-2021"
echo "This program may be freely redistributed under the terms of the GNU AGPLv3." echo "This program may be freely redistributed under the terms of the GNU AGPLv3."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment