Skip to content

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

fix quotes in format strings

parent 4ffb304e
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 16 deletions
bin/epm-packages
View file @ c32b74d3
...@@ -26,11 +26,11 @@ case $PMTYPE in ...@@ -26,11 +26,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"
...@@ -61,17 +61,17 @@ case $PMTYPE in ...@@ -61,17 +61,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)
......
bin/epm-print
View file @ c32b74d3
...@@ -44,10 +44,10 @@ dpkg_query_package_format_field() ...@@ -44,10 +44,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
} }
......
bin/epm-query
View file @ c32b74d3
...@@ -190,8 +190,8 @@ __epm_query_file() ...@@ -190,8 +190,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"
...@@ -223,8 +223,8 @@ __epm_query_name() ...@@ -223,8 +223,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
;; ;;
...@@ -271,12 +271,12 @@ __epm_query_shortname() ...@@ -271,12 +271,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
;; ;;
......
tests/test_sudo.sh
View file @ c32b74d3
...@@ -11,4 +11,8 @@ sudorun() ...@@ -11,4 +11,8 @@ sudorun()
} }
#run "EDITOR=vim crontab -e" #run "EDITOR=vim crontab -e"
sudorun EDITOR=vim crontab -e #sudorun EDITOR=vim crontab -e
dorun rpm -q --queryformat "%{size}@%{name}-%{version}-%{release}\\\n" mc
dorun rpm -q --queryformat '%{size}@%{name}-%{version}-%{release}\\n' mc
#dorun dpkg-query -W --showformat="\\\${Package}-\\\${Version}\\\n" -- mc
#dorun dpkg-query -W --showformat='\${Package}-\${Version}\\n' -- mc
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