fix quotes in format strings

bin/epm-packages

@@ -26,11 +26,11 @@ case $PMTYPE in
 	*-rpm)
 		# FIXME: space with quotes problems, use point instead
 		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)
 		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"
@@ -61,17 +61,17 @@ case $PMTYPE in
 		warmup_dpkgbase
 		# FIXME: strong equal
 		#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}
-		[ -n "$short" ] && CMD="dpkg-query -W --showformat=\${db:Status-Abbrev}\${Package}\n $pkg_filenames"
-		showcmd $CMD
+		[ -n "$short" ] && CMD="dpkg-query -W --showformat=\${db:Status-Abbrev}\${Package}\\n $pkg_filenames"
+		showcmd "$CMD"
 		$CMD | grep "^i" | sed -e "s|.* ||g" | __fo_pfn
 		return ;;
 	*-rpm)
 		warmup_rpmbase
 		# FIXME: strong equal
 		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
 		return ;;
 	packagekit)

bin/epm-print

@@ -44,10 +44,10 @@ dpkg_query_package_format_field()
         local field="$1"
         shift
         if [ -f "$1" ] ; then
-            a= dpkg-deb --show --showformat="$field\n" "$@"
+            a= dpkg-deb --show --showformat="$field\\\n" "$@"
         else
             #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
 }
 

bin/epm-query

@@ -190,8 +190,8 @@ __epm_query_file()
 			[ -n "$short" ] && CMD="rpm -qp --queryformat %{name}\n"
 			;;
 		*-dpkg)
-			CMD="dpkg-deb --show --showformat=\${Package}-\${Version}\n"
-			[ -n "$short" ] && CMD="dpkg-query --show --showformat=\${Package}\n"
+			CMD="dpkg-deb --show --showformat='\${Package}-\${Version}\\n'"
+			[ -n "$short" ] && CMD="dpkg-query --show --showformat='\${Package}\\n'"
 			;;
 		*)
 			fatal "Do not know command for query file package"
@@ -223,8 +223,8 @@ __epm_query_name()
 			;;
 		*-dpkg)
 			#docmd dpkg -l $@ | grep "^ii"
-			#CMD="dpkg-query -W --showformat=\${Package}-\${Version}\n"
-			docmd dpkg-query -W "--showformat=\${Package}-\${Version}\n" -- $@ || return
+			#CMD="dpkg-query -W --showformat=\${Package}-\${Version}\\\n"
+			docmd dpkg-query -W "--showformat='\${Package}-\${Version}\\n'" -- $@ || return
 			__epm_query_dpkg_check $@ || return
 			return
 			;;
@@ -271,12 +271,12 @@ __epm_query_shortname()
 	case $PMTYPE in
 		*-rpm)
 			showcmd rpm -q --queryformat '%{name} \n' -- $@
-			a='' rpm -q --queryformat '%{name} \n' -- $@
+			a='' rpm -q --queryformat '%{name} \\n' -- $@
 			return
 			;;
 		*-dpkg)
-			#CMD="dpkg-query -W --showformat=\${Package}\n"
-			docmd dpkg-query -W "--showformat=\${Package}\n" -- $@ || return
+			#CMD="dpkg-query -W --showformat=\${Package}\\\n"
+			docmd dpkg-query -W --showformat='\${Package}\\n' -- $@ || return
 			__epm_query_dpkg_check $@ || return
 			return
 			;;

tests/test_sudo.sh

@@ -11,4 +11,8 @@ sudorun()
 }
 
 #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