Skip to content

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

commit packed 3.24.2

parent 09fb5425
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 18 deletions
packed/epm.sh
View file @ 7462b63b
...@@ -3700,11 +3700,11 @@ case $PMTYPE in ...@@ -3700,11 +3700,11 @@ case $PMTYPE in
*-rpm) *-rpm)
# FIXME: space with quotes problems, use point instead # FIXME: space with quotes problems, use point instead
warmup_rpmbase warmup_rpmbase
docmd rpm -qa --queryformat "%{size}@%{name}-%{version}-%{release}\n" $pkg_filenames | sed -e "s|@| |g" | sort -n -k1 docmd rpm -qa --queryformat '%{size}@%{name}-%{version}-%{release}\\n' $pkg_filenames | sed -e "s|@| |g" | sort -n -k1
;; ;;
*-dpkg) *-dpkg)
warmup_dpkgbase warmup_dpkgbase
docmd dpkg-query -W --showformat="\${Installed-Size}@\${Package}-\${Version}:\${Architecture}\n" $pkg_filenames | sed -e "s|@| |g" | sort -n -k1 docmd dpkg-query -W --showformat='\${Installed-Size}@\${Package}-\${Version}:\${Architecture}\\n' $pkg_filenames | sed -e "s|@| |g" | sort -n -k1
;; ;;
*) *)
fatal "Sorted package list function is not implemented for $PMTYPE" fatal "Sorted package list function is not implemented for $PMTYPE"
...@@ -3734,17 +3734,17 @@ case $PMTYPE in ...@@ -3734,17 +3734,17 @@ case $PMTYPE in
warmup_dpkgbase warmup_dpkgbase
# FIXME: strong equal # FIXME: strong equal
#CMD="dpkg -l $pkg_filenames" #CMD="dpkg -l $pkg_filenames"
CMD="dpkg-query -W --showformat=\${db:Status-Abbrev}\${Package}-\${Version}:\${Architecture}\n $pkg_filenames" CMD="dpkg-query -W --showformat=\${db:Status-Abbrev}\${Package}-\${Version}:\${Architecture}\\n $pkg_filenames"
# TODO: ${Architecture} # TODO: ${Architecture}
[ -n "$short" ] && CMD="dpkg-query -W --showformat=\${db:Status-Abbrev}\${Package}\n $pkg_filenames" [ -n "$short" ] && CMD="dpkg-query -W --showformat=\${db:Status-Abbrev}\${Package}\\n $pkg_filenames"
showcmd $CMD showcmd "$CMD"
$CMD | grep "^i" | sed -e "s|.* ||g" | __fo_pfn $CMD | grep "^i" | sed -e "s|.* ||g" | __fo_pfn
return ;; return ;;
*-rpm) *-rpm)
warmup_rpmbase warmup_rpmbase
# FIXME: strong equal # FIXME: strong equal
CMD="rpm -qa $pkg_filenames" CMD="rpm -qa $pkg_filenames"
[ -n "$short" ] && CMD="rpm -qa --queryformat %{name}\n $pkg_filenames" [ -n "$short" ] && CMD="rpm -qa --queryformat '%{name}\\n' $pkg_filenames"
docmd $CMD docmd $CMD
return ;; return ;;
packagekit) packagekit)
...@@ -4260,10 +4260,10 @@ dpkg_query_package_format_field() ...@@ -4260,10 +4260,10 @@ dpkg_query_package_format_field()
local field="$1" local field="$1"
shift shift
if [ -f "$1" ] ; then if [ -f "$1" ] ; then
a= dpkg-deb --show --showformat="$field\n" "$@" a= dpkg-deb --show --showformat="$field\\\n" "$@"
else else
#a= dpkg -s "$1" | grep "^$field: " | sed -e "s|^$field: ||" #a= dpkg -s "$1" | grep "^$field: " | sed -e "s|^$field: ||"
a= dpkg-query -W --showformat="$field\n" -- "$@" a= dpkg-query -W --showformat="$field\\\n" -- "$@"
fi fi
} }
...@@ -4870,8 +4870,8 @@ __epm_query_file() ...@@ -4870,8 +4870,8 @@ __epm_query_file()
[ -n "$short" ] && CMD="rpm -qp --queryformat %{name}\n" [ -n "$short" ] && CMD="rpm -qp --queryformat %{name}\n"
;; ;;
*-dpkg) *-dpkg)
CMD="dpkg-deb --show --showformat=\${Package}-\${Version}\n" CMD="dpkg-deb --show --showformat='\${Package}-\${Version}\\n'"
[ -n "$short" ] && CMD="dpkg-query --show --showformat=\${Package}\n" [ -n "$short" ] && CMD="dpkg-query --show --showformat='\${Package}\\n'"
;; ;;
*) *)
fatal "Do not know command for query file package" fatal "Do not know command for query file package"
...@@ -4902,8 +4902,8 @@ __epm_query_name() ...@@ -4902,8 +4902,8 @@ __epm_query_name()
;; ;;
*-dpkg) *-dpkg)
#docmd dpkg -l $@ | grep "^ii" #docmd dpkg -l $@ | grep "^ii"
#CMD="dpkg-query -W --showformat=\${Package}-\${Version}\n" #CMD="dpkg-query -W --showformat=\${Package}-\${Version}\\\n"
docmd dpkg-query -W "--showformat=\${Package}-\${Version}\n" -- $@ || return docmd dpkg-query -W "--showformat='\${Package}-\${Version}\\n'" -- $@ || return
__epm_query_dpkg_check $@ || return __epm_query_dpkg_check $@ || return
return return
;; ;;
...@@ -4950,12 +4950,12 @@ __epm_query_shortname() ...@@ -4950,12 +4950,12 @@ __epm_query_shortname()
case $PMTYPE in case $PMTYPE in
*-rpm) *-rpm)
showcmd rpm -q --queryformat '%{name} \n' -- $@ showcmd rpm -q --queryformat '%{name} \n' -- $@
a='' rpm -q --queryformat '%{name} \n' -- $@ a='' rpm -q --queryformat '%{name} \\n' -- $@
return return
;; ;;
*-dpkg) *-dpkg)
#CMD="dpkg-query -W --showformat=\${Package}\n" #CMD="dpkg-query -W --showformat=\${Package}\\\n"
docmd dpkg-query -W "--showformat=\${Package}\n" -- $@ || return docmd dpkg-query -W --showformat='\${Package}\\n' -- $@ || return
__epm_query_dpkg_check $@ || return __epm_query_dpkg_check $@ || return
return return
;; ;;
...@@ -11205,7 +11205,7 @@ Examples: ...@@ -11205,7 +11205,7 @@ Examples:
print_version() print_version()
{ {
echo "EPM package manager version 3.24.1 https://wiki.etersoft.ru/Epm" echo "EPM package manager version 3.24.2 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."
...@@ -11215,7 +11215,7 @@ print_version() ...@@ -11215,7 +11215,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.24.1 EPMVERSION=3.24.2
verbose=$EPM_VERBOSE verbose=$EPM_VERBOSE
quiet= quiet=
nodeps= nodeps=
......
packed/serv.sh
View file @ 7462b63b
...@@ -2291,7 +2291,7 @@ print_version() ...@@ -2291,7 +2291,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.24.1 https://wiki.etersoft.ru/Epm" echo "Service manager version 3.24.2 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